Add latest changes from gitlab-org/gitlab@master

2 files changed, 1 insertions, 23 deletions

diff --git a/spec/support/database/cross-join-allowlist.yml b/spec/support/database/cross-join-allowlist.yml
index 37d2b8aaacb..839b8436900 100644
--- a/spec/support/database/cross-join-allowlist.yml
+++ b/spec/support/database/cross-join-allowlist.yml
@@ -6,9 +6,6 @@
 - "./ee/spec/features/merge_trains/user_adds_merge_request_to_merge_train_spec.rb"
 - "./ee/spec/features/merge_trains/user_adds_to_merge_train_when_pipeline_succeeds_spec.rb"
 - "./ee/spec/features/projects/pipelines/pipeline_spec.rb"
-- "./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/finders/ee/namespaces/projects_finder_spec.rb"
 - "./ee/spec/finders/security/findings_finder_spec.rb"
 - "./ee/spec/graphql/ee/resolvers/namespace_projects_resolver_spec.rb"
@@ -47,38 +44,23 @@
 - "./ee/spec/services/ee/merge_requests/refresh_service_spec.rb"
 - "./ee/spec/workers/scan_security_report_secrets_worker_spec.rb"
 - "./spec/controllers/admin/runners_controller_spec.rb"
-- "./spec/controllers/groups/runners_controller_spec.rb"
 - "./spec/controllers/groups/settings/ci_cd_controller_spec.rb"
 - "./spec/controllers/projects/merge_requests_controller_spec.rb"
-- "./spec/controllers/projects/runners_controller_spec.rb"
 - "./spec/controllers/projects/settings/ci_cd_controller_spec.rb"
 - "./spec/features/admin/admin_runners_spec.rb"
-- "./spec/features/groups/settings/ci_cd_spec.rb"
 - "./spec/features/ide/user_opens_merge_request_spec.rb"
 - "./spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb"
 - "./spec/features/merge_request/user_sees_merge_widget_spec.rb"
-- "./spec/features/merge_request/user_sees_pipelines_from_forked_project_spec.rb"
-- "./spec/features/merge_request/user_sees_pipelines_spec.rb"
-- "./spec/features/project_group_variables_spec.rb"
-- "./spec/features/project_variables_spec.rb"
-- "./spec/features/projects/badges/list_spec.rb"
 - "./spec/features/projects/infrastructure_registry_spec.rb"
 - "./spec/features/projects/jobs_spec.rb"
 - "./spec/features/projects/pipelines/pipeline_spec.rb"
 - "./spec/features/projects/pipelines/pipelines_spec.rb"
-- "./spec/features/projects/settings/pipelines_settings_spec.rb"
-- "./spec/features/security/project/internal_access_spec.rb"
-- "./spec/features/security/project/private_access_spec.rb"
-- "./spec/features/security/project/public_access_spec.rb"
-- "./spec/features/triggers_spec.rb"
 - "./spec/finders/ci/pipelines_for_merge_request_finder_spec.rb"
 - "./spec/finders/ci/runners_finder_spec.rb"
 - "./spec/frontend/fixtures/runner.rb"
 - "./spec/graphql/mutations/ci/runner/delete_spec.rb"
 - "./spec/graphql/resolvers/ci/group_runners_resolver_spec.rb"
-- "./spec/graphql/resolvers/ci/job_token_scope_resolver_spec.rb"
 - "./spec/graphql/resolvers/merge_request_pipelines_resolver_spec.rb"
-- "./spec/graphql/types/ci/job_token_scope_type_spec.rb"
 - "./spec/lib/api/entities/package_spec.rb"
 - "./spec/lib/gitlab/background_migration/migrate_legacy_artifacts_spec.rb"
 - "./spec/mailers/emails/pipelines_spec.rb"
@@ -105,8 +87,6 @@
 - "./spec/requests/api/commit_statuses_spec.rb"
 - "./spec/requests/api/graphql/group_query_spec.rb"
 - "./spec/requests/api/graphql/merge_request/merge_request_spec.rb"
-- "./spec/requests/api/graphql/mutations/ci/job_token_scope/add_project_spec.rb"
-- "./spec/requests/api/graphql/mutations/ci/job_token_scope/remove_project_spec.rb"
 - "./spec/requests/api/graphql/mutations/merge_requests/create_spec.rb"
 - "./spec/requests/api/graphql/packages/composer_spec.rb"
 - "./spec/requests/api/graphql/packages/conan_spec.rb"
@@ -132,8 +112,6 @@
 - "./spec/services/merge_requests/refresh_service_spec.rb"
 - "./spec/support/shared_examples/ci/pipeline_email_shared_examples.rb"
 - "./spec/support/shared_examples/features/packages_shared_examples.rb"
-- "./spec/support/shared_examples/features/search_settings_shared_examples.rb"
-- "./spec/support/shared_examples/features/variable_list_shared_examples.rb"
 - "./spec/support/shared_examples/models/concerns/limitable_shared_examples.rb"
 - "./spec/support/shared_examples/requests/api/graphql/packages/group_and_project_packages_list_shared_examples.rb"
 - "./spec/support/shared_examples/requests/api/graphql/packages/package_details_shared_examples.rb"
diff --git a/spec/support/database/prevent_cross_joins.rb b/spec/support/database/prevent_cross_joins.rb
index 4b78aa9014c..2a3f4904f1f 100644
--- a/spec/support/database/prevent_cross_joins.rb
+++ b/spec/support/database/prevent_cross_joins.rb
@@ -46,7 +46,7 @@ module Database
       if schemas.include?(:gitlab_ci) && schemas.include?(:gitlab_main)
         Thread.current[:has_cross_join_exception] = true
         raise CrossJoinAcrossUnsupportedTablesError,
-          "Unsupported cross-join across '#{tables.join(", ")}' modifying '#{schemas.to_a.join(", ")}' discovered " \
+          "Unsupported cross-join across '#{tables.join(", ")}' querying '#{schemas.to_a.join(", ")}' discovered " \
           "when executing query '#{sql}'. Please refer to https://docs.gitlab.com/ee/development/database/multiple_databases.html#removing-joins-between-ci_-and-non-ci_-tables for details on how to resolve this exception."
       end
     end