Merge branch 'rails5-flatten' into 'master'

Fix project team members count

Closes #46283

See merge request gitlab-org/gitlab-ce!19195

1 files changed, 5 insertions, 3 deletions

diff --git a/app/services/projects/participants_service.rb b/app/services/projects/participants_service.rb
index eb0472c6024..21741913385 100644
--- a/app/services/projects/participants_service.rb
+++ b/app/services/projects/participants_service.rb
@@ -5,14 +5,16 @@ module Projects
     def execute(noteable)
       @noteable = noteable
 
-      project_members = sorted(project.team.members)
       participants = noteable_owner + participants_in_noteable + all_members + groups + project_members
       participants.uniq
     end
 
+    def project_members
+      @project_members ||= sorted(project.team.members)
+    end
+
     def all_members
-      count = project.team.members.flatten.count
-      [{ username: "all", name: "All Project and Group Members", count: count }]
+      [{ username: "all", name: "All Project and Group Members", count: project_members.count }]
     end
   end
 end