diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-01 12:49:38 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-01 12:49:38 +0300 |
| commit | 279c943c83169f667a07ebf5570da6d2c3b64429 (patch) | |
| tree | bf5baf0144942f062f2b1bc273e265eddde55b02 /app/views/notify | |
| parent | 5b9e4d986a70b0dd4088598c500fd0cd9e85f25e (diff) | |
| parent | 180685be976403bff6e152b2749618d1f8b9b348 (diff) | |
Merge branch '46840-fix-merge-request-unmergeable-email-plural' into 'master'
Resolve "Unmergeable merge request notification text interpolation"
Closes #46840
See merge request gitlab-org/gitlab-ce!19160
Diffstat (limited to 'app/views/notify')
| -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 |
2 files changed, 2 insertions, 2 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} |