diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-06-25 16:21:13 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-06-25 16:21:13 +0900 |
| commit | 6c3eea0db04be446a1daebf629b6ddf9e0f18d18 (patch) | |
| tree | 7de3db2d1addf9ea8e018817c1b8de378d33fb9d /app/mailers/emails/merge_requests.rb | |
| parent | 24ba0989878a363c37d86758844a17a99fc7ae0c (diff) | |
| parent | 2bac2918b2d6f12d94f739f4b6865b9e9221c642 (diff) | |
| download | gitlab-ce-6c3eea0db04be446a1daebf629b6ddf9e0f18d18.tar.gz | |
Merge branch 'master' into build-chunks-on-object-storage
Diffstat (limited to 'app/mailers/emails/merge_requests.rb')
| -rw-r--r-- | app/mailers/emails/merge_requests.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb index 5ba3a4a322c..70509e9066d 100644 --- a/app/mailers/emails/merge_requests.rb +++ b/app/mailers/emails/merge_requests.rb @@ -59,8 +59,6 @@ module Emails def merge_request_unmergeable_email(recipient_id, merge_request_id, reason = nil) setup_merge_request_mail(merge_request_id, recipient_id) - @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 |