diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-06-20 22:13:28 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-06-20 22:13:28 +0300 |
| commit | a8f4f48e4ad0283e4542b36b10a3edebf1e700a0 (patch) | |
| tree | d155c00b6544c6b32bdf4ec034726228ca62df8c /app/views | |
| parent | 1a426b040f3cef46dd63a54afcb65404b18ebfc6 (diff) | |
| parent | 937bd9e386f54eeac2ef2009173d58a7842f9779 (diff) | |
Merge branch '47488-remove-unmergeable-notification-for-no-commits' into 'master'
Notify only merge request unmergeable due to conflict
See merge request gitlab-org/gitlab-ce!19548
Diffstat (limited to 'app/views')
| -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)} |