Commit 15f43627 authored by Adam Hegyi's avatar Adam Hegyi

Merge branch 'fix-phase4-specs-v3' into 'master'

Mark `Projects::OverwriteProjectService#destroy_old_project` as doing cross-DB

See merge request gitlab-org/gitlab!78079
parents 60cc9b62 e7cfad5c
......@@ -11,7 +11,9 @@ module Projects
move_before_destroy_relationships(source_project)
# Reset is required in order to get the proper
# uncached fork network method calls value.
destroy_old_project(source_project.reset)
::Gitlab::Database::QueryAnalyzers::PreventCrossDatabaseModification.allow_cross_database_modification_within_transaction(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/340256') do
destroy_old_project(source_project.reset)
end
rename_project(source_project.name, source_project.path)
@project
......
......@@ -8,4 +8,3 @@
- "./spec/models/clusters/applications/runner_spec.rb"
- "./spec/requests/api/commits_spec.rb"
- "./spec/services/ci/retry_build_service_spec.rb"
- "./spec/services/projects/overwrite_project_service_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