diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2019-08-07 10:18:13 +0000 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2019-08-07 10:18:13 +0000 |
| commit | 55da8b279203f87a125f62fd4a5f4eec66af2ef2 (patch) | |
| tree | 26f292bb49065a8a334052d444551afa8b275f5c /app | |
| parent | 0a514100a69554681d11d41b583a1515e2246774 (diff) | |
| parent | 35ce4820f24c15a5c7bdb111d73a90fd9bea2655 (diff) | |
| download | gitlab-ce-55da8b279203f87a125f62fd4a5f4eec66af2ef2.tar.gz | |
Merge branch 'sh-disable-registry-delete' into 'master'
Don't attempt to contact registry if it is disabled
See merge request gitlab-org/gitlab-ce!31553
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/projects/destroy_service.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb index a1279bfb3a3..5893b8eedff 100644 --- a/app/services/projects/destroy_service.rb +++ b/app/services/projects/destroy_service.rb @@ -173,6 +173,7 @@ module Projects end def remove_registry_tags + return true unless Gitlab.config.registry.enabled return false unless remove_legacy_registry_tags project.container_repositories.find_each do |container_repository| |