From 11ece334ec544e2a6f6213ce63ba9efcf819050b Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 2 Oct 2023 18:11:51 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/controllers/concerns/renders_projects_list.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'app/controllers') diff --git a/app/controllers/concerns/renders_projects_list.rb b/app/controllers/concerns/renders_projects_list.rb index 2d37bc3f9a5..56383658696 100644 --- a/app/controllers/concerns/renders_projects_list.rb +++ b/app/controllers/concerns/renders_projects_list.rb @@ -5,7 +5,7 @@ module RendersProjectsList def prepare_projects_for_rendering(projects) preload_max_member_access_for_collection(Project, projects) - current_user.preloaded_member_roles_for_projects(projects) if current_user + preload_member_roles(projects) if current_user # Call the count methods on every project, so the BatchLoader would load them all at # once when the entities are rendered @@ -15,4 +15,10 @@ module RendersProjectsList projects end + + def preload_member_roles(projects) + # overridden in EE + end end + +RendersProjectsList.prepend_mod -- cgit v1.2.3