Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

1 files changed, 6 insertions, 2 deletions

diff --git a/lib/gitlab/container_repository/tags/cache.rb b/lib/gitlab/container_repository/tags/cache.rb
index 47a6e67a5a1..f9de16f002f 100644
--- a/lib/gitlab/container_repository/tags/cache.rb
+++ b/lib/gitlab/container_repository/tags/cache.rb
@@ -18,7 +18,7 @@ module Gitlab
           keys = tags.map(&method(:cache_key))
           cached_tags_count = 0
 
-          ::Gitlab::Redis::Cache.with do |redis|
+          with_redis do |redis|
             tags.zip(redis.mget(keys)).each do |tag, created_at|
               next unless created_at
 
@@ -45,7 +45,7 @@ module Gitlab
 
           now = Time.zone.now
 
-          ::Gitlab::Redis::Cache.with do |redis|
+          with_redis do |redis|
             # we use a pipeline instead of a MSET because each tag has
             # a specific ttl
             redis.pipelined do |pipeline|
@@ -66,6 +66,10 @@ module Gitlab
         def cache_key(tag)
           "container_repository:{#{@container_repository.id}}:tag:#{tag.name}:created_at"
         end
+
+        def with_redis(&block)
+          ::Gitlab::Redis::Cache.with(&block) # rubocop:disable CodeReuse/ActiveRecord
+        end
       end
     end
   end