Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 9 deletions

diff --git a/app/services/projects/participants_service.rb b/app/services/projects/participants_service.rb
index c7a34afffb3..c29770d0c5f 100644
--- a/app/services/projects/participants_service.rb
+++ b/app/services/projects/participants_service.rb
@@ -45,7 +45,7 @@ module Projects
     def visible_groups
       visible_groups = project.invited_groups
 
-      unless project_owner?
+      unless project.team.owner?(current_user)
         visible_groups = visible_groups.public_or_visible_to_user(current_user)
       end
 
@@ -60,13 +60,5 @@ module Projects
     def individual_project_members
       project.project_members.select(*GroupMember.cached_column_list)
     end
-
-    def project_owner?
-      if project.group.present?
-        project.group.owners.include?(current_user)
-      else
-        project.namespace.owner == current_user
-      end
-    end
   end
 end