Commit 279c943c authored by Sean McGivern's avatar Sean McGivern

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
parents 5b9e4d98 180685be
%p %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 %ul
- @reasons.each do |reason| - @reasons.each do |reason|
......
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| - @reasons.each do |reason|
* #{reason} * #{reason}
......
...@@ -422,7 +422,7 @@ describe Notify do ...@@ -422,7 +422,7 @@ describe Notify do
aggregate_failures do aggregate_failures do
is_expected.to have_referable_subject(merge_request, reply: true) 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(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| reasons.each do |reason|
is_expected.to have_body_text(reason) is_expected.to have_body_text(reason)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment