summaryrefslogtreecommitdiff
path: root/app/mailers/emails/merge_requests.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/mailers/emails/merge_requests.rb')
-rw-r--r--app/mailers/emails/merge_requests.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb
index 76b1c2d234c..c709c2950d6 100644
--- a/app/mailers/emails/merge_requests.rb
+++ b/app/mailers/emails/merge_requests.rb
@@ -92,6 +92,13 @@ module Emails
mail_answer_thread(@merge_request, merge_request_thread_options(resolved_by_user_id, recipient_id, reason))
end
+ def merge_when_pipeline_succeeds_email(recipient_id, merge_request_id, mwps_set_by_user_id, reason = nil)
+ setup_merge_request_mail(merge_request_id, recipient_id)
+
+ @mwps_set_by = ::User.find(mwps_set_by_user_id)
+ mail_answer_thread(@merge_request, merge_request_thread_options(mwps_set_by_user_id, recipient_id, reason))
+ end
+
private
def setup_merge_request_mail(merge_request_id, recipient_id, present: false)