From df541e510e5da0949286aa73a24ad748bc2d05c6 Mon Sep 17 00:00:00 2001
From: Ahmad Sherif <me@ahmadsherif.com>
Date: Fri, 22 Jul 2016 18:42:54 +0200
Subject: [PATCH] Load project invited groups and members eagerly in
ProjectTeam#fetch_members
---
CHANGELOG | 1 +
app/models/project_team.rb | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index e2104338f5ccb..fa2727550338d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@ v 8.11.0 (unreleased)
- 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
- Retrieve rendered HTML from cache in one request
+ - Load project invited groups and members eagerly in ProjectTeam#fetch_members
v 8.10.0
- Fix profile activity heatmap to show correct day name (eanplatter)
diff --git a/app/models/project_team.rb b/app/models/project_team.rb
index 0b700930641e3..9d312a5379052 100644
--- a/app/models/project_team.rb
+++ b/app/models/project_team.rb
@@ -173,7 +173,7 @@ def fetch_members(level = nil)
invited_members = []
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
im = invited_group.members
--
GitLab