Add latest changes from gitlab-org/gitlab@16-5-stable-eev16.5.0-rc42

1 files changed, 6 insertions, 0 deletions

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 30f8f6fdfe5..a892b6e6ac6 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -67,6 +67,8 @@ module UsersHelper
     project_ids = projects.pluck(:id)
     # rubocop: enable CodeReuse/ActiveRecord
 
+    preload_project_associations(projects)
+
     Preloaders::UserMaxAccessLevelInProjectsPreloader
       .new(project_ids, current_user)
       .execute
@@ -371,6 +373,10 @@ module UsersHelper
   def saved_replies_enabled?
     Feature.enabled?(:saved_replies, current_user)
   end
+
+  def preload_project_associations(_)
+    # Overridden in EE
+  end
 end
 
 UsersHelper.prepend_mod_with('UsersHelper')