diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-03-21 16:55:14 +0000 |
---|---|---|
committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-03-23 10:24:45 -0600 |
commit | 33c35a15f1610a58f9f1bcaeb313ed99583dd085 (patch) | |
tree | 28411b31ba63c07b8bc19c03a8c59e89e316420b | |
parent | 0d48ad497e134a63d58300f59c16fe753704a501 (diff) | |
download | gitlab-ce-33c35a15f1610a58f9f1bcaeb313ed99583dd085.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) } |