From 99b01e23598e6b0b2bcae891939ea28c67f7b2e9 Mon Sep 17 00:00:00 2001 From: YarNayar Date: Tue, 25 Jul 2017 14:56:09 +0300 Subject: Send notification emails when push to a merge request Closes #23460 --- app/mailers/emails/merge_requests.rb | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'app/mailers') diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb index 5fe09cea83f..be99f3780cc 100644 --- a/app/mailers/emails/merge_requests.rb +++ b/app/mailers/emails/merge_requests.rb @@ -11,6 +11,14 @@ module Emails mail_answer_thread(@merge_request, merge_request_thread_options(updated_by_user_id, recipient_id, reason)) end + def push_to_merge_request_email(recipient_id, merge_request_id, updated_by_user_id, reason = nil, new_commits: [], existing_commits: []) + setup_merge_request_mail(merge_request_id, recipient_id) + @new_commits = new_commits + @existing_commits = existing_commits + + mail_answer_thread(@merge_request, merge_request_thread_options(updated_by_user_id, recipient_id, reason)) + end + def reassigned_merge_request_email(recipient_id, merge_request_id, previous_assignee_id, updated_by_user_id, reason = nil) setup_merge_request_mail(merge_request_id, recipient_id) -- cgit v1.2.3