summaryrefslogtreecommitdiff
path: root/app/services
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-03-16 13:52:45 +0200
committerValery Sizov <vsv2711@gmail.com>2015-03-16 13:52:55 +0200
commit09ef69b7c8e534cedff2ca1a42b58f534e349107 (patch)
treedcccbd830331c7c7558f57cae349f18ebd0b5e7c /app/services
parent9698b36c1cd0808adb006593c0e8649cb42f3571 (diff)
downloadgitlab-ce-09ef69b7c8e534cedff2ca1a42b58f534e349107.tar.gz
code folding fix
Diffstat (limited to 'app/services')
-rw-r--r--app/services/notification_service.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index 4fa775a28ce..edfb62a4b18 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -368,16 +368,16 @@ class NotificationService
recipients = reject_muted_users(recipients, project)
recipients = reject_mention_users(recipients, project)
- recipients = add_subscribers(recipients, project)
+ recipients = add_subscribed_users(recipients, project)
recipients = recipients.concat(project_watchers(project)).uniq
recipients = reject_unsubscribed_users(recipients, target)
recipients
end
- def add_subscribers(recipients, target)
- subs = target.subscribes
- if subs.any?
- recipients.merge(subs.where("subscribed is true").map(&:user))
+ def add_subscribed_users(recipients, target)
+ subscribes = target.subscribes
+ if subscribes.any?
+ recipients.merge(subscribes.where("subscribed is true").map(&:user))
else
recipients
end