summaryrefslogtreecommitdiff
path: root/app/models/project.rb
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-04-03 16:34:18 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-04-03 16:34:18 +0200
commite9d5e95c4403d39072b6d29555569b2d09b02fe6 (patch)
treecb70e8af587cb8bc0d7a2773ed7ed5ca5f577c08 /app/models/project.rb
parenta9b221d91a5529c514615b640cdbbaf6b99bf790 (diff)
downloadgitlab-ce-e9d5e95c4403d39072b6d29555569b2d09b02fe6.tar.gz
Revert changes in services related to moving projects
Diffstat (limited to 'app/models/project.rb')
-rw-r--r--app/models/project.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 0adec807f34..fa64ccbf7e4 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -894,8 +894,8 @@ class Project < ActiveRecord::Base
expire_caches_before_rename(old_path_with_namespace)
- if container_repositories.present?
- Rails.logger.error "Project #{old_path_with_namespace} cannot be renamed because container registry images are present"
+ if has_container_registry_tags?
+ Rails.logger.error "Project #{old_path_with_namespace} cannot be renamed because container registry tags are present!"
# we currently doesn't support renaming repository if it contains images in container registry
raise StandardError.new('Project cannot be renamed, because images are present in its container registry')