Commit 0049f328 authored by Dylan Griffith's avatar Dylan Griffith

Merge branch 'more_scopes_allowlist' into 'master'

More scopes allowlist

See merge request gitlab-org/gitlab!73112
parents 6f343281 4ced63e8
...@@ -42,6 +42,8 @@ module Ci ...@@ -42,6 +42,8 @@ module Ci
triggered_for_branch.for_sha(commit_shas) triggered_for_branch.for_sha(commit_shas)
end end
pipelines = pipelines.allow_cross_joins_across_databases(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/336891')
sort(pipelines) sort(pipelines)
end end
end end
......
...@@ -124,6 +124,7 @@ module EE ...@@ -124,6 +124,7 @@ module EE
scope :with_code_coverage, -> do scope :with_code_coverage, -> do
joins(:daily_build_group_report_results).merge(::Ci::DailyBuildGroupReportResult.with_coverage.with_default_branch).group(:id) joins(:daily_build_group_report_results).merge(::Ci::DailyBuildGroupReportResult.with_coverage.with_default_branch).group(:id)
.allow_cross_joins_across_databases(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/339974')
end end
scope :with_coverage_feature_usage, ->(default_branch: nil) do scope :with_coverage_feature_usage, ->(default_branch: nil) do
......
- "./ee/spec/finders/ee/namespaces/projects_finder_spec.rb"
- "./ee/spec/graphql/ee/resolvers/namespace_projects_resolver_spec.rb"
- "./ee/spec/models/project_spec.rb"
- "./ee/spec/requests/api/ci/minutes_spec.rb" - "./ee/spec/requests/api/ci/minutes_spec.rb"
- "./ee/spec/services/ci/minutes/additional_packs/change_namespace_service_spec.rb" - "./ee/spec/services/ci/minutes/additional_packs/change_namespace_service_spec.rb"
- "./ee/spec/services/ci/minutes/additional_packs/create_service_spec.rb" - "./ee/spec/services/ci/minutes/additional_packs/create_service_spec.rb"
...@@ -8,7 +5,6 @@ ...@@ -8,7 +5,6 @@
- "./spec/features/groups/packages_spec.rb" - "./spec/features/groups/packages_spec.rb"
- "./spec/features/projects/infrastructure_registry_spec.rb" - "./spec/features/projects/infrastructure_registry_spec.rb"
- "./spec/features/projects/packages_spec.rb" - "./spec/features/projects/packages_spec.rb"
- "./spec/finders/ci/pipelines_for_merge_request_finder_spec.rb"
- "./spec/lib/api/entities/package_spec.rb" - "./spec/lib/api/entities/package_spec.rb"
- "./spec/lib/gitlab/background_migration/copy_ci_builds_columns_to_security_scans_spec.rb" - "./spec/lib/gitlab/background_migration/copy_ci_builds_columns_to_security_scans_spec.rb"
- "./spec/lib/gitlab/background_migration/migrate_pages_metadata_spec.rb" - "./spec/lib/gitlab/background_migration/migrate_pages_metadata_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