diff options
| author | YarNayar <YarTheGreat@gmail.com> | 2017-07-25 14:56:09 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-03-26 13:24:52 +0100 |
| commit | 99b01e23598e6b0b2bcae891939ea28c67f7b2e9 (patch) | |
| tree | c32d351419cd399dcb104eac54563b7028bbd1d8 /app/mailers | |
| parent | bb9d360c0a7daed6aa08a0635e084c314c2c8b3e (diff) | |
| download | gitlab-ce-99b01e23598e6b0b2bcae891939ea28c67f7b2e9.tar.gz | |
Send notification emails when push to a merge requestYarNayar/gitlab-ce-23460-send-email-when-pushing-more-commits-to-the-merge-request
Closes #23460
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 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) |