Commit 522f7cd4 authored by Dylan Griffith's avatar Dylan Griffith

Merge branch 'allow_search_service_callsite' into 'master'

Fix CI cross-join in Search::GlobalService

See merge request gitlab-org/gitlab!69430
parents 3060decd 675f0fe8
......@@ -24,7 +24,7 @@ module Search
# rubocop: disable CodeReuse/ActiveRecord
def projects
@projects ||= ProjectsFinder.new(params: { non_archived: true }, current_user: current_user).execute.includes(:topics, :taggings)
@projects ||= ProjectsFinder.new(params: { non_archived: true }, current_user: current_user).execute.preload(:topics, :taggings)
end
def allowed_scopes
......
- "./ee/spec/controllers/ee/projects/jobs_controller_spec.rb"
- "./ee/spec/controllers/ee/search_controller_spec.rb"
- "./ee/spec/controllers/operations_controller_spec.rb"
- "./ee/spec/controllers/projects/issues_controller_spec.rb"
- "./ee/spec/controllers/projects/security/vulnerabilities_controller_spec.rb"
......@@ -32,7 +31,6 @@
- "./ee/spec/features/projects/settings/auto_rollback_spec.rb"
- "./ee/spec/features/projects/settings/pipeline_subscriptions_spec.rb"
- "./ee/spec/features/projects/settings/protected_environments_spec.rb"
- "./ee/spec/features/search/elastic/group_search_spec.rb"
- "./ee/spec/finders/ee/namespaces/projects_finder_spec.rb"
- "./ee/spec/finders/group_projects_finder_spec.rb"
- "./ee/spec/finders/security/findings_finder_spec.rb"
......@@ -100,7 +98,6 @@
- "./ee/spec/services/ee/merge_requests/create_pipeline_service_spec.rb"
- "./ee/spec/services/ee/merge_requests/refresh_service_spec.rb"
- "./ee/spec/services/merge_trains/refresh_merge_request_service_spec.rb"
- "./ee/spec/services/search/group_service_spec.rb"
- "./ee/spec/services/security/report_summary_service_spec.rb"
- "./ee/spec/services/security/vulnerability_counting_service_spec.rb"
- "./ee/spec/support/features/redacted_search_results_examples.rb"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment