Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 32 deletions

diff --git a/lib/gitlab/redis/duplicate_jobs.rb b/lib/gitlab/redis/duplicate_jobs.rb
deleted file mode 100644
index c76d298da18..00000000000
--- a/lib/gitlab/redis/duplicate_jobs.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module Redis
-    # Pseudo-store to transition `Gitlab::SidekiqMiddleware::DuplicateJobs` from
-    # using `Sidekiq.redis` to using the `SharedState` redis store.
-    class DuplicateJobs < ::Gitlab::Redis::Wrapper
-      class << self
-        def store_name
-          'SharedState'
-        end
-
-        private
-
-        def redis
-          primary_store = ::Redis.new(Gitlab::Redis::SharedState.params)
-
-          # `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
-      end
-    end
-  end
-end