From a660f548966bc8232cb56c4e344b0da3c91b3701 Mon Sep 17 00:00:00 2001 From: Mark Chao Date: Fri, 18 May 2018 09:50:01 +0800 Subject: Plural reason(s) --- app/mailers/emails/merge_requests.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/mailers') 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 -- cgit v1.2.3