diff options
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/emails/issues.rb | 2 | ||||
| -rw-r--r-- | app/mailers/emails/merge_requests.rb | 2 | ||||
| -rw-r--r-- | app/mailers/notify.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/mailers/emails/issues.rb b/app/mailers/emails/issues.rb index d64e48f774b..dea282de4b3 100644 --- a/app/mailers/emails/issues.rb +++ b/app/mailers/emails/issues.rb @@ -3,7 +3,7 @@ module Emails def new_issue_email(recipient_id, issue_id) setup_issue_mail(issue_id, recipient_id) - mail_new_thread(@issue, issue_thread_options(@issue.author_id, recipient_id)) + mail_new_discussion(@issue, issue_thread_options(@issue.author_id, recipient_id)) end def new_mention_in_issue_email(recipient_id, issue_id, updated_by_user_id) diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb index ec27ac517db..2a6b0371adb 100644 --- a/app/mailers/emails/merge_requests.rb +++ b/app/mailers/emails/merge_requests.rb @@ -3,7 +3,7 @@ module Emails def new_merge_request_email(recipient_id, merge_request_id) setup_merge_request_mail(merge_request_id, recipient_id) - mail_new_thread(@merge_request, merge_request_thread_options(@merge_request.author_id, recipient_id)) + mail_new_discussion(@merge_request, merge_request_thread_options(@merge_request.author_id, recipient_id)) end def new_mention_in_merge_request_email(recipient_id, merge_request_id, updated_by_user_id) diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb index 0bc1c19e9cd..589ac2a9885 100644 --- a/app/mailers/notify.rb +++ b/app/mailers/notify.rb @@ -136,7 +136,7 @@ class Notify < BaseMailer # with headers suitable for grouping by thread in email clients. # # See: mail_answer_thread - def mail_new_thread(model, headers = {}) + def mail_new_discussion(model, headers = {}) headers['Message-ID'] = message_id(model) mail_thread(model, headers) |