diff options
| author | Mark Chao <mchao@gitlab.com> | 2018-05-26 12:39:20 +0800 |
|---|---|---|
| committer | Mark Chao <mchao@gitlab.com> | 2018-05-31 23:13:20 +0900 |
| commit | 180685be976403bff6e152b2749618d1f8b9b348 (patch) | |
| tree | 0fbc7451cb28ae2a00b5cf613369f21848ea801a | |
| parent | de12348ee8534b2a4310c81898e7151dd7616095 (diff) | |
| download | gitlab-ce-180685be976403bff6e152b2749618d1f8b9b348.tar.gz | |
Fix merge request unmergeable notification email plural interpolation46840-fix-merge-request-unmergeable-email-plural
| -rw-r--r-- | app/views/notify/merge_request_unmergeable_email.html.haml | 2 | ||||
| -rw-r--r-- | app/views/notify/merge_request_unmergeable_email.text.haml | 2 | ||||
| -rw-r--r-- | spec/mailers/notify_spec.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/notify/merge_request_unmergeable_email.html.haml b/app/views/notify/merge_request_unmergeable_email.html.haml index e84905a5fad..578fa1fbce7 100644 --- a/app/views/notify/merge_request_unmergeable_email.html.haml +++ b/app/views/notify/merge_request_unmergeable_email.html.haml @@ -1,5 +1,5 @@ %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 #{pluralize(@reasons, '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 the following #{'reason'.pluralize(@reasons.count)}: %ul - @reasons.each do |reason| diff --git a/app/views/notify/merge_request_unmergeable_email.text.haml b/app/views/notify/merge_request_unmergeable_email.text.haml index 4f0901c761a..e4f9f1bf5e7 100644 --- a/app/views/notify/merge_request_unmergeable_email.text.haml +++ b/app/views/notify/merge_request_unmergeable_email.text.haml @@ -1,4 +1,4 @@ -Merge Request #{@merge_request.to_reference} can no longer be merged due to the following #{pluralize(@reasons, 'reason')}: +Merge Request #{@merge_request.to_reference} can no longer be merged due to the following #{'reason'.pluralize(@reasons.count)}: - @reasons.each do |reason| * #{reason} diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb index f310a6854d5..69eafbe4bbe 100644 --- a/spec/mailers/notify_spec.rb +++ b/spec/mailers/notify_spec.rb @@ -422,7 +422,7 @@ describe Notify do aggregate_failures do is_expected.to have_referable_subject(merge_request, reply: true) is_expected.to have_body_text(project_merge_request_path(project, merge_request)) - is_expected.to have_body_text('reasons:') + is_expected.to have_body_text('following reasons:') reasons.each do |reason| is_expected.to have_body_text(reason) end |