Commit 55da8b27 authored by Thong Kuah's avatar Thong Kuah

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
parents 0a514100 35ce4820
......@@ -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|
......
---
title: Don't attempt to contact registry if it is disabled
merge_request: 31553
author:
type: fixed
......@@ -241,6 +241,18 @@ describe Projects::DestroyService do
expect(destroy_project(project, user)).to be false
end
end
context 'when registry is disabled' do
before do
stub_container_registry_config(enabled: false)
end
it 'does not attempting to remove any tags' do
expect(Projects::ContainerRepository::DestroyService).not_to receive(:new)
destroy_project(project, user)
end
end
end
context 'when there are tags for legacy root repository' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment