diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-02 15:10:15 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-02 15:10:15 +0300 |
| commit | bdf5d637dab13620c56063c628274746182196ad (patch) | |
| tree | ac85f7fd0a998f0edd373adebf5a71f8714e9c2b /app/mailers | |
| parent | 0c178b535cda98a248e136ba5128f0d903edb17d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/emails/merge_requests.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb index 4faa1a11276..494d9875ce4 100644 --- a/app/mailers/emails/merge_requests.rb +++ b/app/mailers/emails/merge_requests.rb @@ -82,6 +82,13 @@ module Emails mail_answer_thread(@merge_request, merge_request_thread_options(updated_by_user_id, recipient_id, reason)) end + def request_review_merge_request_email(recipient_id, merge_request_id, updated_by_user_id, reason = nil) + setup_merge_request_mail(merge_request_id, recipient_id) + + @updated_by = User.find(updated_by_user_id) + mail_answer_thread(@merge_request, merge_request_thread_options(updated_by_user_id, recipient_id, reason)) + end + def merge_request_status_email(recipient_id, merge_request_id, status, updated_by_user_id, reason = nil) setup_merge_request_mail(merge_request_id, recipient_id) |