diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/notify/merge_request_unmergeable_email.html.haml | 4 | ||||
| -rw-r--r-- | app/views/notify/merge_request_unmergeable_email.text.haml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/notify/merge_request_unmergeable_email.html.haml b/app/views/notify/merge_request_unmergeable_email.html.haml index f51a31c0eda..e84905a5fad 100644 --- a/app/views/notify/merge_request_unmergeable_email.html.haml +++ b/app/views/notify/merge_request_unmergeable_email.html.haml @@ -1,6 +1,6 @@ %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(s): + 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 #{pluralize(@reasons, 'reason')}: %ul - - @merge_request_presenter.unmergeable_reasons.each do |reason| + - @reasons.each do |reason| %li= reason diff --git a/app/views/notify/merge_request_unmergeable_email.text.haml b/app/views/notify/merge_request_unmergeable_email.text.haml index 2acf0de34fc..4f0901c761a 100644 --- a/app/views/notify/merge_request_unmergeable_email.text.haml +++ b/app/views/notify/merge_request_unmergeable_email.text.haml @@ -1,6 +1,6 @@ -Merge Request #{@merge_request.to_reference} can no longer be merged due to the following reason(s): +Merge Request #{@merge_request.to_reference} can no longer be merged due to the following #{pluralize(@reasons, 'reason')}: -- @merge_request_presenter.unmergeable_reasons.each do |reason| +- @reasons.each do |reason| * #{reason} Merge Request url: #{project_merge_request_url(@merge_request.target_project, @merge_request)} |