diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-06-01 10:55:38 +0300 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-06-01 10:55:38 +0300 |
commit | 83510980497ca72eb43fa9540be7abcbb6e811fc (patch) | |
tree | 9aeb5fcd4f6ec4784455180b07d2e564f10eeb41 /app/services | |
parent | 1364dd12cce13769ab42cf664eca2f42d886aaec (diff) | |
parent | 8a5ad3ca00830f847504eddb4ade7d3d7ebf9916 (diff) |
Merge branch 'rails5-flatten' into 'master'
Fix project team members count
Closes #46283
See merge request gitlab-org/gitlab-ce!19195
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/projects/participants_service.rb | 8 |
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 |