Add latest changes from gitlab-org/gitlab@13-1-stable-ee

1 files changed, 13 insertions, 1 deletions

diff --git a/app/models/container_repository.rb b/app/models/container_repository.rb
index 455c672cea3..b0f7edac2f3 100644
--- a/app/models/container_repository.rb
+++ b/app/models/container_repository.rb
@@ -16,7 +16,13 @@ class ContainerRepository < ApplicationRecord
   scope :ordered, -> { order(:name) }
   scope :with_api_entity_associations, -> { preload(project: [:route, { namespace: :route }]) }
   scope :for_group_and_its_subgroups, ->(group) do
-    where(project_id: Project.for_group_and_its_subgroups(group).with_container_registry.select(:id))
+    project_scope = Project
+      .for_group_and_its_subgroups(group)
+      .with_container_registry
+      .select(:id)
+
+    ContainerRepository
+      .joins("INNER JOIN (#{project_scope.to_sql}) projects on projects.id=container_repositories.project_id")
   end
   scope :search_by_name, ->(query) { fuzzy_search(query, [:name], use_minimum_char_limit: false) }
 
@@ -67,6 +73,12 @@ class ContainerRepository < ApplicationRecord
     end
   end
 
+  def tags_count
+    return 0 unless manifest && manifest['tags']
+
+    manifest['tags'].size
+  end
+
   def blob(config)
     ContainerRegistry::Blob.new(self, config)
   end