diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-03-30 14:58:20 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-03-30 14:58:20 +0300 |
| commit | 6412c4c54a7a824e108899a34b1ecec5cbdcec4b (patch) | |
| tree | afe9fa7485520c60d91315d8f73c6f1d64108c8c /app/mailers | |
| parent | ddb23d3b2ba7c646cff6a5d21957194fc3474418 (diff) | |
| parent | fa1eabe8e82f7635f2aa51733c727728577c7644 (diff) | |
Merge branch 'master' into stuartnelson3/gitlab-ce-stn/issue-due-email
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) |