From 123582839259a70910bd0e9109e57ed65d71cb23 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 2 Aug 2023 03:08:52 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/services/groups/participants_service.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'app/services/groups') diff --git a/app/services/groups/participants_service.rb b/app/services/groups/participants_service.rb index e939d27d464..a2238264295 100644 --- a/app/services/groups/participants_service.rb +++ b/app/services/groups/participants_service.rb @@ -13,7 +13,7 @@ module Groups participants_in_noteable + all_members + groups + - group_members + group_hierarchy_users render_participants_as_hash(participants.uniq) end @@ -26,12 +26,10 @@ module Groups [{ username: "all", name: "All Group Members", count: group.users_count }] end - def group_members + def group_hierarchy_users return [] unless group - sorted( - group.direct_and_indirect_users(share_with_groups: group.member?(current_user)) - ) + sorted(Autocomplete::GroupUsersFinder.new(group: group).execute) end end end -- cgit v1.2.3