Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhttp://jneen.net/ <jneen@jneen.net>2017-08-03 00:16:00 +0300
committerhttp://jneen.net/ <jneen@jneen.net>2017-08-03 19:07:18 +0300
commit273cd9c3c9d94e1d40249073ec23e4eba820f260 (patch)
tree98921ccfd0c05af9b06842992960bd7c6208bef7 /app/services/notification_service.rb
parenteaa503d679e3c2a1396091efebda49a91637cb02 (diff)
remove build_relabeled_recipients
Diffstat (limited to 'app/services/notification_service.rb')
-rw-r--r--app/services/notification_service.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index 2e52296f048..a62085dffd4 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -368,7 +368,13 @@ class NotificationService
end
def relabeled_resource_email(target, labels, current_user, method)
- recipients = NotificationRecipientService.build_relabeled_recipients(target, current_user, labels: labels)
+ recipients = labels.flat_map { |l| l.subscribers(target.project) }
+ recipients = NotificationRecipientService.notifiable_users(
+ recipients, :subscription,
+ target: target,
+ acting_user: current_user,
+ )
+
label_names = labels.map(&:name)
recipients.each do |recipient|