From 075f6d3559f0a0127fb322b40fad7985df621fcd Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Thu, 29 Aug 2019 20:20:03 +0100
Subject: Add X-GitLab-NotificationReason header to note emails

The 'assigned' reason doesn't apply to notes, but the other two
can ('mentioned' and 'own_activity'), so we can still use this for note
emails.
---
 app/mailers/emails/notes.rb          | 25 +++++++++++++------------
 app/services/notification_service.rb |  2 +-
 2 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'app')

diff --git a/app/mailers/emails/notes.rb b/app/mailers/emails/notes.rb
index 04db1980b99..8b93ead0ee6 100644
--- a/app/mailers/emails/notes.rb
+++ b/app/mailers/emails/notes.rb
@@ -2,44 +2,44 @@
 
 module Emails
   module Notes
-    def note_commit_email(recipient_id, note_id)
+    def note_commit_email(recipient_id, note_id, reason = nil)
       setup_note_mail(note_id, recipient_id)
 
       @commit = @note.noteable
       @target_url = project_commit_url(*note_target_url_options)
-      mail_answer_note_thread(@commit, @note, note_thread_options(recipient_id))
+      mail_answer_note_thread(@commit, @note, note_thread_options(recipient_id, reason))
     end
 
-    def note_issue_email(recipient_id, note_id)
+    def note_issue_email(recipient_id, note_id, reason = nil)
       setup_note_mail(note_id, recipient_id)
 
       @issue = @note.noteable
       @target_url = project_issue_url(*note_target_url_options)
-      mail_answer_note_thread(@issue, @note, note_thread_options(recipient_id))
+      mail_answer_note_thread(@issue, @note, note_thread_options(recipient_id, reason))
     end
 
-    def note_merge_request_email(recipient_id, note_id)
+    def note_merge_request_email(recipient_id, note_id, reason = nil)
       setup_note_mail(note_id, recipient_id)
 
       @merge_request = @note.noteable
       @target_url = project_merge_request_url(*note_target_url_options)
-      mail_answer_note_thread(@merge_request, @note, note_thread_options(recipient_id))
+      mail_answer_note_thread(@merge_request, @note, note_thread_options(recipient_id, reason))
     end
 
-    def note_project_snippet_email(recipient_id, note_id)
+    def note_project_snippet_email(recipient_id, note_id, reason = nil)
       setup_note_mail(note_id, recipient_id)
 
       @snippet = @note.noteable
       @target_url = project_snippet_url(*note_target_url_options)
-      mail_answer_note_thread(@snippet, @note, note_thread_options(recipient_id))
+      mail_answer_note_thread(@snippet, @note, note_thread_options(recipient_id, reason))
     end
 
-    def note_personal_snippet_email(recipient_id, note_id)
+    def note_personal_snippet_email(recipient_id, note_id, reason = nil)
       setup_note_mail(note_id, recipient_id)
 
       @snippet = @note.noteable
       @target_url = snippet_url(@note.noteable)
-      mail_answer_note_thread(@snippet, @note, note_thread_options(recipient_id))
+      mail_answer_note_thread(@snippet, @note, note_thread_options(recipient_id, reason))
     end
 
     private
@@ -48,11 +48,12 @@ module Emails
       [@project || @group, @note.noteable, anchor: "note_#{@note.id}"]
     end
 
-    def note_thread_options(recipient_id)
+    def note_thread_options(recipient_id, reason)
       {
         from: sender(@note.author_id),
         to: recipient(recipient_id, @project&.group || @group),
-        subject: subject("#{@note.noteable.title} (#{@note.noteable.reference_link_text})")
+        subject: subject("#{@note.noteable.title} (#{@note.noteable.reference_link_text})"),
+        'X-GitLab-NotificationReason' => reason
       }
     end
 
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index 5b8c1288854..a4243b7bc5e 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -285,7 +285,7 @@ class NotificationService
 
     recipients = NotificationRecipientService.build_new_note_recipients(note)
     recipients.each do |recipient|
-      mailer.send(notify_method, recipient.user.id, note.id).deliver_later
+      mailer.send(notify_method, recipient.user.id, note.id, recipient.reason).deliver_later
     end
   end
 
-- 
cgit v1.2.1