summaryrefslogtreecommitdiff
path: root/app/mailers
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2016-08-15 14:47:16 +0100
committerNick Thomas <nick@gitlab.com>2016-08-15 14:47:16 +0100
commit6642ae4579d6ceed6b26014aee4a22adb39fc43c (patch)
treef22f9704185059cfd49e65488bdb44174fce478d /app/mailers
parentb450aab8501076740cd7140b47488b9dfa5f58f9 (diff)
downloadgitlab-ce-6642ae4579d6ceed6b26014aee4a22adb39fc43c.tar.gz
Add notifications for new user mentions in merge requests
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/emails/merge_requests.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb
index 9dd11d20ea6..95810b0ac6e 100644
--- a/app/mailers/emails/merge_requests.rb
+++ b/app/mailers/emails/merge_requests.rb
@@ -6,6 +6,11 @@ module Emails
mail_new_thread(@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)
+ setup_merge_request_mail(merge_request_id, recipient_id)
+ mail_answer_thread(@merge_request, merge_request_thread_options(updated_by_user_id, recipient_id))
+ end
+
def reassigned_merge_request_email(recipient_id, merge_request_id, previous_assignee_id, updated_by_user_id)
setup_merge_request_mail(merge_request_id, recipient_id)