Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

2 files changed, 3 insertions, 1 deletions

diff --git a/lib/gitlab/redis/duplicate_jobs.rb b/lib/gitlab/redis/duplicate_jobs.rb
index beb3ba1abee..c76d298da18 100644
--- a/lib/gitlab/redis/duplicate_jobs.rb
+++ b/lib/gitlab/redis/duplicate_jobs.rb
@@ -18,9 +18,11 @@ module Gitlab
           # `Sidekiq.redis` is a namespaced redis connection. This means keys are actually being stored under
           # "resque:gitlab:resque:gitlab:duplicate:". For backwards compatibility, we make the secondary store
           # namespaced in the same way, but omit it from the primary so keys have proper format there.
+          # rubocop:disable Cop/RedisQueueUsage
           secondary_store = ::Redis::Namespace.new(
             Gitlab::Redis::Queues::SIDEKIQ_NAMESPACE, redis: ::Redis.new(Gitlab::Redis::Queues.params)
           )
+          # rubocop:enable Cop/RedisQueueUsage
 
           MultiStore.new(primary_store, secondary_store, name.demodulize)
         end
diff --git a/lib/gitlab/redis/sidekiq_status.rb b/lib/gitlab/redis/sidekiq_status.rb
index d4362c7cad8..9b8bbf5a0ad 100644
--- a/lib/gitlab/redis/sidekiq_status.rb
+++ b/lib/gitlab/redis/sidekiq_status.rb
@@ -14,7 +14,7 @@ module Gitlab
 
         def redis
           primary_store = ::Redis.new(Gitlab::Redis::SharedState.params)
-          secondary_store = ::Redis.new(Gitlab::Redis::Queues.params)
+          secondary_store = ::Redis.new(Gitlab::Redis::Queues.params) # rubocop:disable Cop/RedisQueueUsage
 
           MultiStore.new(primary_store, secondary_store, name.demodulize)
         end