summaryrefslogtreecommitdiff
path: root/app/models/project.rb
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-03-23 15:54:59 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-03-23 15:54:59 +0100
commitdcd2eeb1cfb633f4a28ddd9bc79deac0e3171d3f (patch)
treee0cc4860cdd544e666a12bd8b436419489c2d07a /app/models/project.rb
parent3e01fed5cb36962065f5d19ab6a0cef1dfc14b48 (diff)
downloadgitlab-ce-dcd2eeb1cfb633f4a28ddd9bc79deac0e3171d3f.tar.gz
Rename container image to repository in specs
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 4aa9c6bb2f2..5c6672c95b3 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -157,7 +157,7 @@ class Project < ActiveRecord::Base
has_one :import_data, dependent: :destroy, class_name: "ProjectImportData"
has_one :project_feature, dependent: :destroy
has_one :statistics, class_name: 'ProjectStatistics', dependent: :delete
- has_many :container_images, dependent: :destroy
+ has_many :container_repositories, dependent: :destroy
has_many :commit_statuses, dependent: :destroy
has_many :pipelines, dependent: :destroy, class_name: 'Ci::Pipeline'
@@ -908,7 +908,7 @@ class Project < ActiveRecord::Base
expire_caches_before_rename(old_path_with_namespace)
- if container_images.present?
+ if container_repositories.present?
Rails.logger.error "Project #{old_path_with_namespace} cannot be renamed because container registry images are present"
# we currently doesn't support renaming repository if it contains images in container registry