diff options
| author | Mark Chao <mchao@gitlab.com> | 2018-06-07 17:56:59 +0300 |
|---|---|---|
| committer | Mark Chao <mchao@gitlab.com> | 2018-06-20 18:27:17 +0300 |
| commit | 5b994b8199a3679b6f5ef0d00edce22ea9662664 (patch) | |
| tree | 6574c99eb3b963d0518e079f041552bb10367756 /app/views/notify | |
| parent | 222284a6bf9348b30b5ce2b1b04370163e2120e5 (diff) | |
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
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/merge_request_unmergeable_email.html.haml | 6 | ||||
| -rw-r--r-- | app/views/notify/merge_request_unmergeable_email.text.haml | 5 |
2 files changed, 2 insertions, 9 deletions
diff --git a/app/views/notify/merge_request_unmergeable_email.html.haml b/app/views/notify/merge_request_unmergeable_email.html.haml index 578fa1fbce7..7ec0c1ef390 100644 --- a/app/views/notify/merge_request_unmergeable_email.html.haml +++ b/app/views/notify/merge_request_unmergeable_email.html.haml @@ -1,6 +1,2 @@ %p - Merge Request #{link_to @merge_request.to_reference, project_merge_request_url(@merge_request.target_project, @merge_request)} can no longer be merged due to the following #{'reason'.pluralize(@reasons.count)}: - - %ul - - @reasons.each do |reason| - %li= reason + Merge Request #{link_to @merge_request.to_reference, project_merge_request_url(@merge_request.target_project, @merge_request)} can no longer be merged due to conflict. diff --git a/app/views/notify/merge_request_unmergeable_email.text.haml b/app/views/notify/merge_request_unmergeable_email.text.haml index e4f9f1bf5e7..dcdd6db69d6 100644 --- a/app/views/notify/merge_request_unmergeable_email.text.haml +++ b/app/views/notify/merge_request_unmergeable_email.text.haml @@ -1,7 +1,4 @@ -Merge Request #{@merge_request.to_reference} can no longer be merged due to the following #{'reason'.pluralize(@reasons.count)}: - -- @reasons.each do |reason| - * #{reason} +Merge Request #{@merge_request.to_reference} can no longer be merged due to conflict. Merge Request url: #{project_merge_request_url(@merge_request.target_project, @merge_request)} |