diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/services/projects/update_repository_storage_service.rb | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/services/projects/update_repository_storage_service.rb')
-rw-r--r-- | app/services/projects/update_repository_storage_service.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/services/projects/update_repository_storage_service.rb b/app/services/projects/update_repository_storage_service.rb index 0632df6f6d7..fa8d4c5aa5f 100644 --- a/app/services/projects/update_repository_storage_service.rb +++ b/app/services/projects/update_repository_storage_service.rb @@ -24,7 +24,7 @@ module Projects mark_old_paths_for_archive repository_storage_move.finish! - project.update!(repository_storage: destination_storage_name, repository_read_only: false) + project.leave_pool_repository project.track_project_repository end @@ -34,10 +34,7 @@ module Projects ServiceResponse.success rescue StandardError => e - project.transaction do - repository_storage_move.do_fail! - project.update!(repository_read_only: false) - end + repository_storage_move.do_fail! Gitlab::ErrorTracking.track_exception(e, project_path: project.full_path) |