Commit graph

11 commits

Author SHA1 Message Date
GitLab Bot
b420660ef1 Add latest changes from gitlab-org/gitlab@master 2022-07-28 18:09:03 +00:00
GitLab Bot
fe4751154c Add latest changes from gitlab-org/gitlab@master 2022-04-07 15:09:57 +00:00
GitLab Bot
1abf48c10c Add latest changes from gitlab-org/gitlab@master 2021-03-30 18:10:47 +00:00
GitLab Bot
c8795e6bd0 Add latest changes from gitlab-org/gitlab@master 2021-03-11 00:09:38 +00:00
GitLab Bot
1c75400c24 Add latest changes from gitlab-org/gitlab@master 2020-07-03 09:08:53 +00:00
Oswaldo Ferreira
ca884980ee [CE] Support multiple assignees for merge requests
Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161
(code out of ee/ folder).
2019-04-08 18:40:00 -03:00
Kushal Pandya
08c1989b0d
Use sanitize_name to sanitize URL in user full name 2019-01-31 16:52:48 +01:00
Mark Chao
5b994b8199 Notify only when unmergeable due to conflict
There is still the edge case when 'no commits' changes to 'conflict'
would not trigger notification, which we ignore for now.

Calling can_be_merged? can cause exception (e.g. non-UTF8)
Ignore those by rescueing.

Remove unmergeable_reason as now only conflict is notified

Update spec
2018-06-20 23:27:17 +08:00
Mark Chao
180685be97 Fix merge request unmergeable notification email plural interpolation 2018-05-31 23:13:20 +09:00
Mark Chao
a660f54896 Plural reason(s) 2018-05-18 09:50:01 +08:00
lulalala
dc174e9655 Notify with email when merge request became unmergeable
Display MR unmergeable reasons
2018-05-17 08:54:51 +08:00