diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-12-19 13:03:54 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-12-19 13:03:54 +0000 |
| commit | f9fd9b1def8dec9800f8d3857ee278ed6dca03c3 (patch) | |
| tree | 2cbb53d5c73df8dab9e7baf3d7f65230bab06858 /app/services | |
| parent | fd86e7432744979c0f17fc0dcca157a6606a15c0 (diff) | |
| parent | 752e9c18a1c2521636ddeec65b7bda2035ce1893 (diff) | |
| download | gitlab-ce-f9fd9b1def8dec9800f8d3857ee278ed6dca03c3.tar.gz | |
Merge branch 'zj-pool-destruction' into 'master'
Leave object pools when destroying projects
Closes gitaly#1415
See merge request gitlab-org/gitlab-ce!23869
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/projects/destroy_service.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb index 210571b6b4e..336d029d330 100644 --- a/app/services/projects/destroy_service.rb +++ b/app/services/projects/destroy_service.rb @@ -137,6 +137,8 @@ module Projects raise_error('Failed to remove some tags in project container registry. Please try again or contact administrator.') end + project.leave_pool_repository + Project.transaction do log_destroy_event trash_repositories! |