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

Plural reason(s)

This commit is contained in:
Mark Chao 2018-05-18 09:50:01 +08:00
parent 953bb41f25
commit a660f54896
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/mailers/emails/merge_requests.rb
View File

@ -59,7 +59,7 @@ module Emails
def merge_request_unmergeable_email(recipient_id, merge_request_id, reason = nil) def merge_request_unmergeable_email(recipient_id, merge_request_id, reason = nil)
setup_merge_request_mail(merge_request_id, recipient_id) setup_merge_request_mail(merge_request_id, recipient_id)
@merge_request_presenter = MergeRequestPresenter.new(@merge_request, current_user: current_user) @reasons = MergeRequestPresenter.new(@merge_request, current_user: current_user).unmergeable_reasons
mail_answer_thread(@merge_request, merge_request_thread_options(@merge_request.author_id, recipient_id, reason)) mail_answer_thread(@merge_request, merge_request_thread_options(@merge_request.author_id, recipient_id, reason))
end end

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

@ -1,6 +1,6 @@
%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 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 %ul
- @merge_request_presenter.unmergeable_reasons.each do |reason| - @reasons.each do |reason|
%li= reason %li= reason

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

@ -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} * #{reason}
Merge Request url: #{project_merge_request_url(@merge_request.target_project, @merge_request)} Merge Request url: #{project_merge_request_url(@merge_request.target_project, @merge_request)}

1
spec/mailers/notify_spec.rb
View File

@ -422,6 +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:')
reasons.each do |reason| reasons.each do |reason|
is_expected.to have_body_text(reason) is_expected.to have_body_text(reason)
end end