Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 2 deletions

diff --git a/spec/models/preloaders/user_max_access_level_in_projects_preloader_spec.rb b/spec/models/preloaders/user_max_access_level_in_projects_preloader_spec.rb
index 7d4268f74e9..7411bc95147 100644
--- a/spec/models/preloaders/user_max_access_level_in_projects_preloader_spec.rb
+++ b/spec/models/preloaders/user_max_access_level_in_projects_preloader_spec.rb
@@ -23,7 +23,8 @@ RSpec.describe Preloaders::UserMaxAccessLevelInProjectsPreloader do
       # we have an existing N+1, one for each project for which user is not a member
       # in this spec, project_3, project_4, project_5
       # https://gitlab.com/gitlab-org/gitlab/-/issues/362890
-      expect { query }.to make_queries(projects.size + 3)
+      ee_only_policy_check_queries = Gitlab.ee? ? 1 : 0
+      expect { query }.to make_queries(projects.size + 3 + ee_only_policy_check_queries)
     end
   end
 
diff --git a/spec/services/search_service_spec.rb b/spec/services/search_service_spec.rb
index e70c16ae721..5edea13afa4 100644
--- a/spec/services/search_service_spec.rb
+++ b/spec/services/search_service_spec.rb
@@ -511,7 +511,7 @@ RSpec.describe SearchService do
         end
 
         context 'with :with_api_entity_associations' do
-          it_behaves_like "redaction limits N+1 queries", limit: 13
+          it_behaves_like "redaction limits N+1 queries", limit: 14
         end
       end