From d23b2a0871f3ca507aafa949e0314625f1f0c6a7 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 8 Nov 2019 09:06:07 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/services/groups/transfer_service.rb | 2 +- app/services/groups/update_service.rb | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'app/services/groups') diff --git a/app/services/groups/transfer_service.rb b/app/services/groups/transfer_service.rb index 14f5a605633..24813f6ddf9 100644 --- a/app/services/groups/transfer_service.rb +++ b/app/services/groups/transfer_service.rb @@ -75,7 +75,7 @@ module Groups # rubocop: enable CodeReuse/ActiveRecord def group_projects_contain_registry_images? - @group.has_container_repositories? + @group.has_container_repository_including_subgroups? end def update_group_attributes diff --git a/app/services/groups/update_service.rb b/app/services/groups/update_service.rb index be7502a193e..8635b82461b 100644 --- a/app/services/groups/update_service.rb +++ b/app/services/groups/update_service.rb @@ -43,8 +43,9 @@ module Groups def renaming_group_with_container_registry_images? new_path = params[:path] - new_path && new_path != group.path && - group.has_container_repositories? + new_path && + new_path != group.path && + group.has_container_repository_including_subgroups? end def container_images_error -- cgit v1.2.3