diff options
| author | lulalala <mark@goodlife.tw> | 2018-05-09 17:49:33 +0800 |
|---|---|---|
| committer | Mark Chao <mchao@gitlab.com> | 2018-05-17 08:54:51 +0800 |
| commit | dc174e9655267e89e1b7c63f8c9f4dac069069c7 (patch) | |
| tree | 33cebe2481870434098f88f253090f2de91b873d /app/mailers | |
| parent | 179a1ee7c669e758f8dc9fb5e9c8f2563012a6e1 (diff) | |
| download | gitlab-ce-dc174e9655267e89e1b7c63f8c9f4dac069069c7.tar.gz | |
Notify with email when merge request became unmergeable
Display MR unmergeable reasons
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/emails/merge_requests.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb index b3f2aeb08ca..c2333180663 100644 --- a/app/mailers/emails/merge_requests.rb +++ b/app/mailers/emails/merge_requests.rb @@ -56,6 +56,14 @@ module Emails mail_answer_thread(@merge_request, merge_request_thread_options(updated_by_user_id, recipient_id, reason)) end + 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) + + mail_answer_thread(@merge_request, merge_request_thread_options(@merge_request.author_id, recipient_id, reason)) + end + def resolved_all_discussions_email(recipient_id, merge_request_id, resolved_by_user_id, reason = nil) setup_merge_request_mail(merge_request_id, recipient_id) |