diff options
| author | Mark Chao <mchao@gitlab.com> | 2018-05-18 09:50:01 +0800 |
|---|---|---|
| committer | Mark Chao <mchao@gitlab.com> | 2018-05-18 09:50:01 +0800 |
| commit | a660f548966bc8232cb56c4e344b0da3c91b3701 (patch) | |
| tree | 0b901111646b4a12ce2013f18137ee7f43ee62e5 | |
| parent | 953bb41f25270c07ab12c17472ef0fe8ab848301 (diff) | |
| download | gitlab-ce-a660f548966bc8232cb56c4e344b0da3c91b3701.tar.gz | |
Plural reason(s)
| -rw-r--r-- | app/mailers/emails/merge_requests.rb | 2 | ||||
| -rw-r--r-- | app/views/notify/merge_request_unmergeable_email.html.haml | 4 | ||||
| -rw-r--r-- | app/views/notify/merge_request_unmergeable_email.text.haml | 4 | ||||
| -rw-r--r-- | spec/mailers/notify_spec.rb | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb index c2333180663..5ba3a4a322c 100644 --- a/app/mailers/emails/merge_requests.rb +++ b/app/mailers/emails/merge_requests.rb @@ -59,7 +59,7 @@ module Emails def merge_request_unmergeable_email(recipient_id, merge_request_id, reason = nil) 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)) end diff --git a/app/views/notify/merge_request_unmergeable_email.html.haml b/app/views/notify/merge_request_unmergeable_email.html.haml index f51a31c0eda..e84905a5fad 100644 --- a/app/views/notify/merge_request_unmergeable_email.html.haml +++ b/app/views/notify/merge_request_unmergeable_email.html.haml @@ -1,6 +1,6 @@ %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 - - @merge_request_presenter.unmergeable_reasons.each do |reason| + - @reasons.each do |reason| %li= reason diff --git a/app/views/notify/merge_request_unmergeable_email.text.haml b/app/views/notify/merge_request_unmergeable_email.text.haml index 2acf0de34fc..4f0901c761a 100644 --- a/app/views/notify/merge_request_unmergeable_email.text.haml +++ b/app/views/notify/merge_request_unmergeable_email.text.haml @@ -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} Merge Request url: #{project_merge_request_url(@merge_request.target_project, @merge_request)} diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb index bed7675db4f..e9b3ccf31fb 100644 --- a/spec/mailers/notify_spec.rb +++ b/spec/mailers/notify_spec.rb @@ -422,6 +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:') reasons.each do |reason| is_expected.to have_body_text(reason) end |