Avoid eager-loading of group associations

8662819a · Dmitry Gruzd · 4c6b1d16 · 8662819a · 8662819a
Commit 8662819a authored Jul 10, 2020 by Dmitry Gruzd
Showing with 6 additions and 1 deletion

ee/app/models/ee/project.rb ee/app/models/ee/project.rb +1 -1

ee/changelogs/unreleased/fix-n-plus-1-for-project-search.yml ee/changelogs/unreleased/fix-n-plus-1-for-project-search.yml +5 -0

No files found.
--- a/ee/app/models/ee/project.rb
+++ b/ee/app/models/ee/project.rb
@@ -202,7 +202,7 @@ module EE

      override :with_web_entity_associations
      def with_web_entity_associations
-        super.preload(:compliance_framework_setting)
+        super.preload(:compliance_framework_setting, group: [:ip_restrictions, :saml_provider])
      end

      override :with_api_entity_associations

--- a/ee/changelogs/unreleased/fix-n-plus-1-for-project-search.yml
+++ b/ee/changelogs/unreleased/fix-n-plus-1-for-project-search.yml
+---
+title: Avoid N+1 of group associations in Search
+merge_request: 36544
+author:
+type: performance