Merge branch 'ee-5063-to-ce-backport' into 'master'

Backports changes made in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5063 to CE

See merge request gitlab-org/gitlab-ce!17909

app/models/group.rb

@@ -230,13 +230,13 @@ class Group < Namespace
       end
     GroupMember
-      .active_without_invites
+      .active_without_invites_and_requests
       .where(source_id: source_ids)
   end
   def members_with_descendants
     GroupMember
-      .active_without_invites
+      .active_without_invites_and_requests
       .where(source_id: self_and_descendants.reorder(nil).select(:id))
   end

app/models/member.rb

@@ -52,7 +52,7 @@ class Member < ActiveRecord::Base
   end
   # Like active, but without invites. For when a User is required.
-  scope :active_without_invites, -> do
+  scope :active_without_invites_and_requests, -> do
     left_join_users
       .where(users: { state: 'active' })
       .non_request

app/services/notification_service.rb

@@ -208,9 +208,9 @@ class NotificationService
   def new_access_request(member)
     return true unless member.notifiable?(:subscription)
-    recipients = member.source.members.active_without_invites.owners_and_masters
+    recipients = member.source.members.active_without_invites_and_requests.owners_and_masters
     if fallback_to_group_owners_masters?(recipients, member)
-      recipients = member.source.group.members.active_without_invites.owners_and_masters
+      recipients = member.source.group.members.active_without_invites_and_requests.owners_and_masters
     end
     recipients.each { |recipient| deliver_access_request_email(recipient, member) }