diff options
Diffstat (limited to 'app/models/container_repository.rb')
-rw-r--r-- | app/models/container_repository.rb | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/app/models/container_repository.rb b/app/models/container_repository.rb index 2d28a81f462..8e130998f11 100644 --- a/app/models/container_repository.rb +++ b/app/models/container_repository.rb @@ -24,15 +24,8 @@ class ContainerRepository < ApplicationRecord scope :for_group_and_its_subgroups, ->(group) do project_scope = Project .for_group_and_its_subgroups(group) - - project_scope = - if Feature.enabled?(:read_container_registry_access_level, group, default_enabled: :yaml) - project_scope.with_feature_enabled(:container_registry) - else - project_scope.with_container_registry - end - - project_scope = project_scope.select(:id) + .with_feature_enabled(:container_registry) + .select(:id) joins("INNER JOIN (#{project_scope.to_sql}) projects on projects.id=container_repositories.project_id") end @@ -153,7 +146,8 @@ class ContainerRepository < ApplicationRecord end def self.create_from_path!(path) - build_from_path(path).tap(&:save!) + safe_find_or_create_by!(project: path.repository_project, + name: path.repository_name) end def self.build_root_repository(project) |