diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-03-21 16:55:14 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-03-21 16:55:14 +0000 |
commit | e39d9371e36034b4a5b41f5d49176611643cbe7a (patch) | |
tree | e341350e15c0c1fcdde9102b602cbc12d33f5a79 | |
parent | a27011f6f8268cc4291d6b840e163b4ed41575d8 (diff) | |
parent | 15a72e05f53a8469eaa577e225a405b0ea02e08b (diff) | |
download | gitlab-ce-e39d9371e36034b4a5b41f5d49176611643cbe7a.tar.gz |
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
-rw-r--r-- | app/models/group.rb | 4 | ||||
-rw-r--r-- | app/models/member.rb | 2 | ||||
-rw-r--r-- | app/services/notification_service.rb | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/models/group.rb b/app/models/group.rb index 8d183006c65..f669b1a7009 100644 --- a/app/models/group.rb +++ b/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 diff --git a/app/models/member.rb b/app/models/member.rb index ec8156bbb01..e1a32148538 100644 --- a/app/models/member.rb +++ b/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 diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb index ab94db2c1e5..d7d2cde1004 100644 --- a/app/services/notification_service.rb +++ b/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) } |