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 /app/mailers | |
| parent | 953bb41f25270c07ab12c17472ef0fe8ab848301 (diff) | |
| download | gitlab-ce-a660f548966bc8232cb56c4e344b0da3c91b3701.tar.gz | |
Plural reason(s)
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/emails/merge_requests.rb | 2 |
1 files changed, 1 insertions, 1 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 |