Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 5 deletions

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