1 files changed, 3 insertions, 15 deletions
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index 660d9891e46..550bd6d4c55 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -98,10 +98,10 @@ class NotificationService
   end
 
   # Notify the user when one of their personal access tokens is revoked
-  def access_token_revoked(user, token_name)
+  def access_token_revoked(user, token_name, source = nil)
     return unless user.can?(:receive_notifications)
 
-    mailer.access_token_revoked_email(user, token_name).deliver_later
+    mailer.access_token_revoked_email(user, token_name, source).deliver_later
   end
 
   # Notify the user when at least one of their ssh key has expired today
@@ -495,13 +495,7 @@ class NotificationService
   def new_access_request(member)
     return true unless member.notifiable?(:subscription)
 
-    source = member.source
-
-    recipients = source.access_request_approvers_to_be_notified
-
-    if fallback_to_group_access_request_approvers?(recipients, source)
-      recipients = source.group.access_request_approvers_to_be_notified
-    end
+    recipients = member.source.access_request_approvers_to_be_notified
 
     return true if recipients.empty?
 
@@ -959,12 +953,6 @@ class NotificationService
     mailer.member_access_requested_email(member.real_source_type, member.id, recipient.user.id).deliver_later
   end
 
-  def fallback_to_group_access_request_approvers?(recipients, source)
-    return false if recipients.present?
-
-    source.respond_to?(:group) && source.group
-  end
-
   def warn_skipping_notifications(user, object)
     Gitlab::AppLogger.warn(message: "Skipping sending notifications", user: user.id, klass: object.class.to_s, object_id: object.id)
   end