diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-02-08 17:02:25 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-02-10 17:34:12 +0200 |
commit | 5f85487c1526f2921f1cef30aceb2fddf84d3632 (patch) | |
tree | fd2eeccef302f6ec04f85d1620cdfc8e4edf3c5e /app/models/group.rb | |
parent | 059d1ae4c847aa9018c89900b39c2782aa9b623e (diff) | |
download | gitlab-ce-5f85487c1526f2921f1cef30aceb2fddf84d3632.tar.gz |
Show parent group members for nested groupdz-nested-groups-members-page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/models/group.rb')
-rw-r--r-- | app/models/group.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/group.rb b/app/models/group.rb index a5b92283daa..cc6624ff4aa 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -206,7 +206,7 @@ class Group < Namespace end def members_with_parents - GroupMember.where(requested_at: nil, source_id: ancestors.map(&:id).push(id)) + GroupMember.non_request.where(source_id: ancestors.map(&:id).push(id)) end def users_with_parents |