1 files changed, 36 insertions, 36 deletions

diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index e9955cd3e2d..19a6779dea9 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -24,16 +24,17 @@ class NotificationService
     end
   end
 
-  # When create an issue we should send next emails:
+  # When create an issue we should send an email to:
   #
   #  * issue assignee if their notification level is not Disabled
   #  * project team members with notification level higher then Participating
+  #  * watchers of the issue's labels
   #
   def new_issue(issue, current_user)
     new_resource_email(issue, issue.project, 'new_issue_email')
   end
 
-  # When we close an issue we should send next emails:
+  # When we close an issue we should send an email to:
   #
   #  * issue author if their notification level is not Disabled
   #  * issue assignee if their notification level is not Disabled
@@ -43,7 +44,7 @@ class NotificationService
     close_resource_email(issue, issue.project, current_user, 'closed_issue_email')
   end
 
-  # When we reassign an issue we should send next emails:
+  # When we reassign an issue we should send an email to:
   #
   #  * issue old assignee if their notification level is not Disabled
   #  * issue new assignee if their notification level is not Disabled
@@ -52,24 +53,25 @@ class NotificationService
     reassign_resource_email(issue, issue.project, current_user, 'reassigned_issue_email')
   end
 
-  # When we change labels on an issue we should send emails.
+  # When we add labels to an issue we should send an email to:
   #
-  # We pass in the labels, here, because we only want the labels that
-  # have been *added* during this relabel, not all of them.
-  def relabeled_issue(issue, labels, current_user)
-    relabel_resource_email(issue, issue.project, labels, current_user, 'relabeled_issue_email')
+  #  * watchers of the issue's labels
+  #
+  def relabeled_issue(issue, added_labels, current_user)
+    relabeled_resource_email(issue, added_labels, current_user, 'relabeled_issue_email')
   end
 
-
-  # When create a merge request we should send next emails:
+  # When create a merge request we should send an email to:
   #
   #  * mr assignee if their notification level is not Disabled
+  #  * project team members with notification level higher then Participating
+  #  * watchers of the mr's labels
   #
   def new_merge_request(merge_request, current_user)
     new_resource_email(merge_request, merge_request.target_project, 'new_merge_request_email')
   end
 
-  # When we reassign a merge_request we should send next emails:
+  # When we reassign a merge_request we should send an email to:
   #
   #  * merge_request old assignee if their notification level is not Disabled
   #  * merge_request assignee if their notification level is not Disabled
@@ -78,12 +80,12 @@ class NotificationService
     reassign_resource_email(merge_request, merge_request.target_project, current_user, 'reassigned_merge_request_email')
   end
 
-  # When we change labels on a merge request we should send emails.
+  # When we add labels to a merge request we should send an email to:
   #
-  # We pass in the labels, here, because we only want the labels that
-  # have been *added* during this relabel, not all of them.
-  def relabeled_merge_request(merge_request, labels, current_user)
-    relabel_resource_email(merge_request, merge_request.project, labels, current_user, 'relabeled_merge_request_email')
+  #  * watchers of the mr's labels
+  #
+  def relabeled_merge_request(merge_request, added_labels, current_user)
+    relabeled_resource_email(merge_request, added_labels, current_user, 'relabeled_merge_request_email')
   end
 
   def close_mr(merge_request, current_user)
@@ -107,7 +109,8 @@ class NotificationService
     reopen_resource_email(
       merge_request,
       merge_request.target_project,
-      current_user, 'merge_request_status_email',
+      current_user,
+      'merge_request_status_email',
       'reopened'
     )
   end
@@ -158,7 +161,6 @@ class NotificationService
     recipients = reject_muted_users(recipients, note.project)
 
     recipients = add_subscribed_users(recipients, note.noteable)
-    recipients = add_label_subscriptions(recipients, note.noteable)
     recipients = reject_unsubscribed_users(recipients, note.noteable)
 
     recipients.delete(note.author)
@@ -365,29 +367,23 @@ class NotificationService
   end
 
   def add_subscribed_users(recipients, target)
-    return recipients unless target.respond_to? :subscriptions
+    return recipients unless target.respond_to? :subscribers
 
-    subscriptions = target.subscriptions
-
-    if subscriptions.any?
-      recipients + subscriptions.where(subscribed: true).map(&:user)
-    else
-      recipients
-    end
+    recipients + target.subscribers
   end
 
-  def add_label_subscriptions(recipients, target)
+  def add_labels_subscribers(recipients, target, labels: nil)
     return recipients unless target.respond_to? :labels
 
-    target.labels.each do |label|
-      recipients += label.subscriptions.where(subscribed: true).map(&:user)
+    (labels || target.labels).each do |label|
+      recipients += label.subscribers
     end
 
     recipients
   end
 
   def new_resource_email(target, project, method)
-    recipients = build_recipients(target, project, target.author)
+    recipients = build_recipients(target, project, target.author, action: :new)
 
     recipients.each do |recipient|
       mailer.send(method, recipient.id, target.id).deliver_later
@@ -419,12 +415,12 @@ class NotificationService
     end
   end
 
-  def relabel_resource_email(target, project, labels, current_user, method)
-    recipients = build_relabel_recipients(target, project, labels, current_user)
+  def relabeled_resource_email(target, labels, current_user, method)
+    recipients = build_relabeled_recipients(target, current_user, labels: labels)
     label_names = labels.map(&:name)
 
     recipients.each do |recipient|
-      mailer.send(method, recipient.id, target.id, current_user.id, label_names).deliver_later
+      mailer.send(method, recipient.id, target.id, label_names, current_user.id).deliver_later
     end
   end
 
@@ -452,7 +448,11 @@ class NotificationService
 
     recipients = reject_muted_users(recipients, project)
     recipients = add_subscribed_users(recipients, target)
-    recipients = add_label_subscriptions(recipients, target)
+
+    if action == :new
+      recipients = add_labels_subscribers(recipients, target)
+    end
+
     recipients = reject_unsubscribed_users(recipients, target)
 
     recipients.delete(current_user)
@@ -460,8 +460,8 @@ class NotificationService
     recipients.uniq
   end
 
-  def build_relabel_recipients(target, project, labels, current_user)
-    recipients = add_label_subscriptions([], target)
+  def build_relabeled_recipients(target, current_user, labels:)
+    recipients = add_labels_subscribers([], target, labels: labels)
     recipients = reject_unsubscribed_users(recipients, target)
     recipients.delete(current_user)
     recipients.uniq