summaryrefslogtreecommitdiff
path: root/app/services/notification_service.rb
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-03-16 15:22:50 +0200
committerValery Sizov <vsv2711@gmail.com>2015-03-16 15:22:50 +0200
commit410d25c8ca8afabb25e5f89b36e3cfd09ffe6f87 (patch)
tree8f159d92f86fbebde5a97cb7c410c85b669475ca /app/services/notification_service.rb
parent0e20dc910f25db3b3f71867d54367db36334ff45 (diff)
downloadgitlab-ce-410d25c8ca8afabb25e5f89b36e3cfd09ffe6f87.tar.gz
rename table subscribe; make it polymorfic
Diffstat (limited to 'app/services/notification_service.rb')
-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 edfb62a4b18..e02418b7246 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -316,8 +316,8 @@ class NotificationService
def reject_unsubscribed_users(recipients, target)
recipients.reject do |user|
- subscribe = target.subscribes.find_by_user_id(user.id)
- subscribe && !subscribe.subscribed
+ subscription = target.subscriptions.find_by_user_id(user.id)
+ subscription && !subscription.subscribed
end
end
@@ -375,9 +375,9 @@ class NotificationService
end
def add_subscribed_users(recipients, target)
- subscribes = target.subscribes
- if subscribes.any?
- recipients.merge(subscribes.where("subscribed is true").map(&:user))
+ subscriptions = target.subscriptions
+ if subscriptions.any?
+ recipients.merge(subscriptions.where("subscribed is true").map(&:user))
else
recipients
end