Commit 3f7ac288 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'fix/load-project-invited-groups-and-members-eagerly' into 'master'

Load project invited groups and members eagerly in ProjectTeam#fetch_members

## What does this MR do?
Load project invited groups and members eagerly in `ProjectTeam#fetch_members`, reducing number of queries to DB.

## Are there points in the code the reviewer needs to double check?
N/A

## Why was this MR needed?
`ProjectTeam#fetch_members` is part of the code path of `Participable#raw_participants`, so it should improve its performance a bit.

## What are the relevant issue numbers?
#19985

## Screenshots (if relevant)
N/A

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- ~~[ ] API support added~~
- ~~Tests~~
  - ~~[ ] Added for this feature/bug~~
  - ~~[ ] All builds are passing~~
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5436
parents fa4eeb49 df541e51
...@@ -4,6 +4,7 @@ v 8.11.0 (unreleased) ...@@ -4,6 +4,7 @@ v 8.11.0 (unreleased)
- Fix of 'Commits being passed to custom hooks are already reachable when using the UI' - Fix of 'Commits being passed to custom hooks are already reachable when using the UI'
- Limit git rev-list output count to one in forced push check - Limit git rev-list output count to one in forced push check
- Retrieve rendered HTML from cache in one request - Retrieve rendered HTML from cache in one request
- Load project invited groups and members eagerly in ProjectTeam#fetch_members
v 8.10.0 v 8.10.0
- Fix profile activity heatmap to show correct day name (eanplatter) - Fix profile activity heatmap to show correct day name (eanplatter)
......
...@@ -173,7 +173,7 @@ class ProjectTeam ...@@ -173,7 +173,7 @@ class ProjectTeam
invited_members = [] invited_members = []
if project.invited_groups.any? && project.allowed_to_share_with_group? if project.invited_groups.any? && project.allowed_to_share_with_group?
project.project_group_links.each do |group_link| project.project_group_links.includes(group: [:group_members]).each do |group_link|
invited_group = group_link.group invited_group = group_link.group
im = invited_group.members im = invited_group.members
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment