diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /app/services/projects/transfer_service.rb | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'app/services/projects/transfer_service.rb')
-rw-r--r-- | app/services/projects/transfer_service.rb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb index 5178c76f0fc..1574c90d2ac 100644 --- a/app/services/projects/transfer_service.rb +++ b/app/services/projects/transfer_service.rb @@ -59,7 +59,7 @@ module Projects raise TransferError.new(s_("TransferProject|Root namespace can't be updated if project has NPM packages")) end - attempt_transfer_transaction + proceed_to_transfer end # rubocop: enable CodeReuse/ActiveRecord @@ -67,7 +67,7 @@ module Projects new_namespace.root_ancestor == project.namespace.root_ancestor end - def attempt_transfer_transaction + def proceed_to_transfer Project.transaction do project.expire_caches_before_rename(@old_path) @@ -87,6 +87,8 @@ module Projects # Move uploads move_project_uploads(project) + update_integrations + project.old_path_with_namespace = @old_path update_repository_configuration(@new_path) @@ -214,6 +216,11 @@ module Projects project.shared_runners_enabled = false end end + + def update_integrations + project.services.inherit.delete_all + Service.create_from_active_default_integrations(project, :project_id) + end end end |