From 6642ae4579d6ceed6b26014aee4a22adb39fc43c Mon Sep 17 00:00:00 2001 From: Nick Thomas Date: Mon, 15 Aug 2016 14:47:16 +0100 Subject: Add notifications for new user mentions in merge requests --- app/mailers/emails/merge_requests.rb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'app/mailers/emails') 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) -- cgit v1.2.3