diff options
| author | Andreas Brandl <abrandl@gitlab.com> | 2018-02-20 16:29:16 +0100 |
|---|---|---|
| committer | Andreas Brandl <abrandl@gitlab.com> | 2018-02-20 18:07:40 +0100 |
| commit | 3dbec2c28534f1df2b229ae22a1d017bf1606143 (patch) | |
| tree | 10d4051db0fd18899c6cd79f6e099def114cc498 | |
| parent | a10d09ec655d37d22c4ec5cadadaa1bdb6cd2f32 (diff) | |
| download | gitlab-ce-41461-project-members-slow-due-to-sql.tar.gz | |
Fix MembersFinder to never include group invitees.41461-project-members-slow-due-to-sql
This was the default behavior, because all members with `user_id` set to
`null` were excluded.
| -rw-r--r-- | app/finders/members_finder.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/finders/members_finder.rb b/app/finders/members_finder.rb index 092c2b3b71e..2ec6cc456af 100644 --- a/app/finders/members_finder.rb +++ b/app/finders/members_finder.rb @@ -13,7 +13,7 @@ class MembersFinder if group group_members = GroupMembersFinder.new(group).execute - group_members = group_members.non_invite unless can?(current_user, :admin_group, group) + group_members = group_members.non_invite union = Gitlab::SQL::Union.new([project_members, group_members], remove_duplicates: false) |