diff options
| author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-03-21 19:14:32 +0300 |
|---|---|---|
| committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-03-21 19:14:32 +0300 |
| commit | 15a72e05f53a8469eaa577e225a405b0ea02e08b (patch) | |
| tree | 232b7aaf88a1b05225febfc3af5b3f65fb175d81 /app/models/group.rb | |
| parent | 40c338a4bbcfbcb1da0a54acfdf730f6bae6763f (diff) | |
Backports changes made in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5063 to CE
Diffstat (limited to 'app/models/group.rb')
| -rw-r--r-- | app/models/group.rb | 4 |
1 files changed, 2 insertions, 2 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 |