diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-08 12:06:07 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-08 12:06:07 +0300 |
| commit | d23b2a0871f3ca507aafa949e0314625f1f0c6a7 (patch) | |
| tree | b1e26c7460bdae25f19103e14978a3aaeef52037 /app/services/groups | |
| parent | 1ef4b65f55f4fc6524a47050b4f6d686beb81d3a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/groups')
| -rw-r--r-- | app/services/groups/transfer_service.rb | 2 | ||||
| -rw-r--r-- | app/services/groups/update_service.rb | 5 |
2 files changed, 4 insertions, 3 deletions
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 |