kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Sean McGivern 2018-06-01 09:49:38 +00:00
parent 5b9e4d986a 180685be97
commit 279c943c83
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/notify/merge_request_unmergeable_email.html.haml
View File

@ -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|

2
app/views/notify/merge_request_unmergeable_email.text.haml
View File

@ -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}

2
spec/mailers/notify_spec.rb
View File

@ -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