From 3dbec2c28534f1df2b229ae22a1d017bf1606143 Mon Sep 17 00:00:00 2001 From: Andreas Brandl Date: Tue, 20 Feb 2018 16:29:16 +0100 Subject: [PATCH] Fix MembersFinder to never include group invitees. This was the default behavior, because all members with `user_id` set to `null` were excluded. --- app/finders/members_finder.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)