diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-04-05 15:44:35 +0300 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-04-05 15:44:35 +0300 |
commit | 000af87190bee6c99ad4e734818b3ba37c21a292 (patch) | |
tree | 1c3c3d9e6f831b817d33e3678eed19bf9d41021b | |
parent | c753975b087cf71d82712624fa5fcd9fa6d79844 (diff) |
Remove redundant code from container registry classes
-rw-r--r-- | app/controllers/projects/registry/repositories_controller.rb | 2 | ||||
-rw-r--r-- | app/models/container_repository.rb | 4 | ||||
-rw-r--r-- | spec/lib/container_registry/blob_spec.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/projects/registry/repositories_controller.rb b/app/controllers/projects/registry/repositories_controller.rb index 737f8424ebf..17f391ba07f 100644 --- a/app/controllers/projects/registry/repositories_controller.rb +++ b/app/controllers/projects/registry/repositories_controller.rb @@ -34,7 +34,7 @@ module Projects break if path.has_repository? ContainerRepository.build_from_path(path).tap do |repository| - repository.save if repository.has_tags? + repository.save! if repository.has_tags? end end end diff --git a/app/models/container_repository.rb b/app/models/container_repository.rb index 463eb5b7d69..9682df3a586 100644 --- a/app/models/container_repository.rb +++ b/app/models/container_repository.rb @@ -28,7 +28,7 @@ class ContainerRepository < ActiveRecord::Base end def manifest - @manifest ||= client.repository_tags(self.path) + @manifest ||= client.repository_tags(path) end def tags @@ -45,7 +45,7 @@ class ContainerRepository < ActiveRecord::Base end def has_tags? - tags.to_a.any? + tags.any? end def root_repository? diff --git a/spec/lib/container_registry/blob_spec.rb b/spec/lib/container_registry/blob_spec.rb index 76ea29666ea..f06e5fd54a2 100644 --- a/spec/lib/container_registry/blob_spec.rb +++ b/spec/lib/container_registry/blob_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe ContainerRegistry::Blob do let(:group) { create(:group, name: 'group') } - let(:project) { create(:project, path: 'test', group: group) } + let(:project) { create(:empty_project, path: 'test', group: group) } let(:repository) do create(:container_repository, name: 'image', |