kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix MembersFinder to never include group invitees.

Browse source 
This was the default behavior, because all members with `user_id` set to
`null` were excluded.
This commit is contained in:
Andreas Brandl 2018-02-20 16:29:16 +01:00
parent a10d09ec65
commit 3dbec2c285
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/finders/members_finder.rb
View file

@ -13,7 +13,7 @@ class MembersFinder
if group if group
group_members = GroupMembersFinder.new(group).execute 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) union = Gitlab::SQL::Union.new([project_members, group_members], remove_duplicates: false)