Don't send an email for "mentioned in" notes

Currently, an email is sent every time a mentionable is referenced by an issue, a commit or a merge request: if I comment "This MR is related to #5", watchers get one email for the comment, and another one stating "Issue #5 was mentioned by issue #13". This is annoying — but the biggest issue is when pushing an existing branch. Every issue referenced by commit messages in this branch will get a new mention (which is fine), and dozens of emails will be sent for all these new mentions (which is not). This commit fixes the spam by avoiding to send an email when a new mention is created. In most cases the email notification for the mentioner is enough.

Don't send an email for "mentioned in" notes
5818cf06 · Pierre de La Morinerie · aff7ac37 · 5818cf06 · 5818cf06
Commit 5818cf06 authored Feb 24, 2014 by Pierre de La Morinerie
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

notification_service.rb app/services/notification_service.rb +1 -0

notification_service_spec.rb spec/services/notification_service_spec.rb +8 -0

No files found.
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -111,6 +111,7 @@ class NotificationService

    # ignore gitlab service messages
    return true if note.note =~ /\A_Status changed to closed_/
+    return true if note.note =~ /\A_mentioned in / && note.system == true

    opts = { noteable_type: note.noteable_type, project_id: note.project_id }


--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -32,6 +32,7 @@ describe NotificationService do
  describe 'Notes' do
    context 'issue note' do
      let(:issue) { create(:issue, assignee: create(:user)) }
+      let(:mentioned_issue) { create(:issue, assignee: issue.assignee) }
      let(:note) { create(:note_on_issue, noteable: issue, project_id: issue.project_id, note: '@mention referenced') }

      before do
@@ -50,6 +51,13 @@ describe NotificationService do
          notification.new_note(note)
        end

+        it 'filters out "mentioned in" notes' do
+          mentioned_note = Note.create_cross_reference_note(mentioned_issue, issue, issue.author, issue.project)
+
+          Notify.should_not_receive(:note_issue_email)
+          notification.new_note(mentioned_note)
+        end
+
        def should_email(user_id)
          Notify.should_receive(:note_issue_email).with(user_id, note.id)
        end