diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-16 18:08:41 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-16 18:08:41 +0300 |
| commit | d47f9d2304dbc3a23bba7fe7a5cd07218eeb41cd (patch) | |
| tree | 4b4efa1ccd8246fba2dc9f8816d9d2c0268e9818 /app/finders | |
| parent | c158fa8d69c704663d289341a014c44c062cda88 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/finders')
| -rw-r--r-- | app/finders/group_members_finder.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/finders/group_members_finder.rb b/app/finders/group_members_finder.rb index 05151b4f1f3..ffa1552627a 100644 --- a/app/finders/group_members_finder.rb +++ b/app/finders/group_members_finder.rb @@ -36,6 +36,8 @@ class GroupMembersFinder < UnionFinder relations << descendant_members end + return GroupMember.none if relations.empty? + members = find_union(relations, GroupMember) filter_members(members, params) end |