diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-17 09:11:44 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-17 09:11:44 +0000 |
| commit | e750680e89a6f98803709c172943962741eeb9e7 (patch) | |
| tree | d3e28a3692460fb37c4891d646220d06e68dfa3d /app/mailers | |
| parent | a17e8b168778e5a107928671fd2829ab284e612d (diff) | |
| download | gitlab-ce-e750680e89a6f98803709c172943962741eeb9e7.tar.gz | |
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, 0 insertions, 7 deletions
diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb index 6a2b447f4a0..fc944c34166 100644 --- a/app/mailers/emails/merge_requests.rb +++ b/app/mailers/emails/merge_requests.rb @@ -104,13 +104,6 @@ module Emails mail_answer_thread(@merge_request, merge_request_thread_options(updated_by_user_id, reason)) end - def attention_requested_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, 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) |