6 commits

Author	SHA1	Message	Date
GitLab Bot	1abf48c10c	Add latest changes from gitlab-org/gitlab@master	2021-03-30 18:10:47 +00:00
GitLab Bot	1c75400c24	Add latest changes from gitlab-org/gitlab@master	2020-07-03 09:08:53 +00: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