diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-23 17:57:46 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-23 17:57:46 +0300 |
commit | 64fc6a9b19faca58ad0087b1a1cb11f7ed910015 (patch) | |
tree | fe4e98cfab4289850ee15965ae0b04648ee90207 /app/services/projects | |
parent | 6317794da29af0bccf95dece5b57b2be2c0977a4 (diff) |
Add latest changes from gitlab-org/gitlab@13-6-stable-ee
Diffstat (limited to 'app/services/projects')
-rw-r--r-- | app/services/projects/transfer_service.rb | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb index 5743efab81b..5178c76f0fc 100644 --- a/app/services/projects/transfer_service.rb +++ b/app/services/projects/transfer_service.rb @@ -71,7 +71,10 @@ module Projects Project.transaction do project.expire_caches_before_rename(@old_path) + # Apply changes to the project update_namespace_and_visibility(@new_namespace) + update_shared_runners_settings + project.save! # Notifications project.send_move_instructions(@old_path) @@ -84,10 +87,6 @@ module Projects # Move uploads move_project_uploads(project) - # If a project is being transferred to another group it means it can already - # have shared runners enabled but we need to check whether the new group allows that. - project.shared_runners_enabled = false if project.group && project.group.shared_runners_setting == 'disabled_and_unoverridable' - project.old_path_with_namespace = @old_path update_repository_configuration(@new_path) @@ -120,7 +119,6 @@ module Projects # Apply new namespace id and visibility level project.namespace = to_namespace project.visibility_level = to_namespace.visibility_level unless project.visibility_level_allowed_by_group? - project.save! end def update_repository_configuration(full_path) @@ -208,6 +206,14 @@ module Projects def new_design_repo_path "#{new_path}#{::Gitlab::GlRepository::DESIGN.path_suffix}" end + + def update_shared_runners_settings + # If a project is being transferred to another group it means it can already + # have shared runners enabled but we need to check whether the new group allows that. + if project.group && project.group.shared_runners_setting == 'disabled_and_unoverridable' + project.shared_runners_enabled = false + end + end end end |