1 files changed, 7 insertions, 11 deletions
diff --git a/lib/gitlab/sidekiq_versioning.rb b/lib/gitlab/sidekiq_versioning.rb
index 8164a5a9d7a..80c0b7650f3 100644
--- a/lib/gitlab/sidekiq_versioning.rb
+++ b/lib/gitlab/sidekiq_versioning.rb
@@ -3,25 +3,21 @@
 module Gitlab
   module SidekiqVersioning
     def self.install!
-      Sidekiq::Manager.prepend SidekiqVersioning::Manager
-
       # The Sidekiq client API always adds the queue to the Sidekiq queue
       # list, but mail_room and gitlab-shell do not. This is only necessary
       # for monitoring.
-      begin
-        queues = SidekiqConfig.worker_queues
+      queues = SidekiqConfig.worker_queues
 
-        if queues.any?
-          Sidekiq.redis do |conn|
-            conn.pipelined do
-              queues.each do |queue|
-                conn.sadd('queues', queue)
-              end
+      if queues.any?
+        Sidekiq.redis do |conn|
+          conn.pipelined do
+            queues.each do |queue|
+              conn.sadd('queues', queue)
             end
           end
         end
-      rescue ::Redis::BaseError, SocketError, Errno::ENOENT, Errno::EADDRNOTAVAIL, Errno::EAFNOSUPPORT, Errno::ECONNRESET, Errno::ECONNREFUSED
       end
+    rescue ::Redis::BaseError, SocketError, Errno::ENOENT, Errno::EADDRNOTAVAIL, Errno::EAFNOSUPPORT, Errno::ECONNRESET, Errno::ECONNREFUSED
     end
   end
 end