move the ability check to reject_users_without_access

1 files changed, 2 insertions, 1 deletions

diff --git a/app/services/notification_recipient_service.rb b/app/services/notification_recipient_service.rb
index 9ac561e4bd2..1abf0335dc4 100644
--- a/app/services/notification_recipient_service.rb
+++ b/app/services/notification_recipient_service.rb
@@ -253,7 +253,6 @@ class NotificationRecipientService
     end
 
     users = users.to_a.compact.uniq
-    users = users.select { |u| u.can?(:receive_notifications) }
 
     users.reject do |user|
       global_notification_setting = user.global_notification_setting
@@ -287,6 +286,8 @@ class NotificationRecipientService
   end
 
   def reject_users_without_access(recipients, target)
+    recipients = recipients.select { |u| u.can?(:receive_notifications) }
+
     ability = case target
               when Issuable
                 :"read_#{target.to_ability_name}"