diff options
| author | Dennis Tang <dtang@gitlab.com> | 2018-06-21 11:48:25 +0300 |
|---|---|---|
| committer | Dennis Tang <dtang@gitlab.com> | 2018-06-21 11:48:25 +0300 |
| commit | 0e7f8fd5bd7ed184b8a12039739200065ffa2dbd (patch) | |
| tree | 07b3c3bbcc0d05848ab7034d2ed32a801f8786b9 /app/views/notify/merge_request_unmergeable_email.text.haml | |
| parent | 203d1026008effeeba5c1f98dba768448473f9fe (diff) | |
| parent | 904cbe0132a1caf0dbb7efb8bdc70398d1d82289 (diff) | |
Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabs
Diffstat (limited to 'app/views/notify/merge_request_unmergeable_email.text.haml')
| -rw-r--r-- | app/views/notify/merge_request_unmergeable_email.text.haml | 5 |
1 files changed, 1 insertions, 4 deletions
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)} |