diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-09-08 06:10:05 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-09-08 06:10:05 +0000 |
| commit | 5949f55235da76eac6e204916502843a87a33d97 (patch) | |
| tree | 8c2b3a92133f140b4809dac18ab245ece762d0f5 | |
| parent | 559d89cf4d6035c17fd4c9787ccfbcf31ff2bda9 (diff) | |
| parent | a5210ba82945485092b7f14833c309122f93a13d (diff) | |
| download | gitlab-ce-5949f55235da76eac6e204916502843a87a33d97.tar.gz | |
Merge branch 'sh-fix-scope-error-container-repo' into 'master'
Fix scoping errors occuring for ContainerRepository on some builds
See merge request gitlab-org/gitlab-ce!21612
| -rw-r--r-- | app/services/projects/destroy_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb index 76e22507698..01de6afcd8e 100644 --- a/app/services/projects/destroy_service.rb +++ b/app/services/projects/destroy_service.rb @@ -159,7 +159,7 @@ module Projects def remove_legacy_registry_tags return true unless Gitlab.config.registry.enabled - ContainerRepository.build_root_repository(project).tap do |repository| + ::ContainerRepository.build_root_repository(project).tap do |repository| break repository.has_tags? ? repository.delete_tags! : true end end |