Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42

2 files changed, 12 insertions, 1 deletions

diff --git a/lib/container_registry/client.rb b/lib/container_registry/client.rb
index cc692140301..46399224a5d 100644
--- a/lib/container_registry/client.rb
+++ b/lib/container_registry/client.rb
@@ -51,6 +51,15 @@ module ContainerRegistry
       client.supports_tag_delete?
     end
 
+    def self.registry_info
+      registry_config = Gitlab.config.registry
+      return unless registry_config.enabled && registry_config.api_url.present?
+
+      token = Auth::ContainerRegistryAuthenticationService.access_token([], [])
+      client = new(registry_config.api_url, token: token)
+      client.registry_info
+    end
+
     def initialize(base_uri, options = {})
       @base_uri = base_uri
       @options = options
diff --git a/lib/container_registry/tag.rb b/lib/container_registry/tag.rb
index 614b1b5e6c6..2a32f950457 100644
--- a/lib/container_registry/tag.rb
+++ b/lib/container_registry/tag.rb
@@ -5,6 +5,7 @@ module ContainerRegistry
     include Gitlab::Utils::StrongMemoize
 
     attr_reader :repository, :name
+    attr_writer :created_at
 
     delegate :registry, :client, to: :repository
     delegate :revision, :short_revision, to: :config_blob, allow_nil: true
@@ -73,9 +74,10 @@ module ContainerRegistry
     end
 
     def created_at
+      return @created_at if @created_at
       return unless config
 
-      strong_memoize(:created_at) do
+      strong_memoize(:memoized_created_at) do
         DateTime.rfc3339(config['created'])
       rescue ArgumentError
         nil