Commit 27696431 authored by Dylan Griffith's avatar Dylan Griffith

Merge branch 'runner_spec_cross_joins' into 'master'

Allowlist scope to remove spec-based list item

See merge request gitlab-org/gitlab!73037
parents d95a43df 107cf715
...@@ -103,7 +103,9 @@ module Ci ...@@ -103,7 +103,9 @@ module Ci
project_groups = ::Group.joins(:projects).where(projects: { id: project_id }) project_groups = ::Group.joins(:projects).where(projects: { id: project_id })
hierarchy_groups = Gitlab::ObjectHierarchy.new(project_groups).base_and_ancestors hierarchy_groups = Gitlab::ObjectHierarchy.new(project_groups).base_and_ancestors
joins(:groups).where(namespaces: { id: hierarchy_groups }) joins(:groups)
.where(namespaces: { id: hierarchy_groups })
.allow_cross_joins_across_databases(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/336433')
} }
scope :owned_or_instance_wide, -> (project_id) do scope :owned_or_instance_wide, -> (project_id) do
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
- "./spec/migrations/associate_existing_dast_builds_with_variables_spec.rb" - "./spec/migrations/associate_existing_dast_builds_with_variables_spec.rb"
- "./spec/migrations/disable_job_token_scope_when_unused_spec.rb" - "./spec/migrations/disable_job_token_scope_when_unused_spec.rb"
- "./spec/migrations/schedule_copy_ci_builds_columns_to_security_scans2_spec.rb" - "./spec/migrations/schedule_copy_ci_builds_columns_to_security_scans2_spec.rb"
- "./spec/models/ci/runner_spec.rb"
- "./spec/presenters/packages/detail/package_presenter_spec.rb" - "./spec/presenters/packages/detail/package_presenter_spec.rb"
- "./spec/requests/api/graphql/group/packages_spec.rb" - "./spec/requests/api/graphql/group/packages_spec.rb"
- "./spec/requests/api/graphql/packages/composer_spec.rb" - "./spec/requests/api/graphql/packages/composer_spec.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