Remove sidekiq-merger

diff --git a/Gemfile b/Gemfile
index 41c636904b09547490c6cb7f45d2276f0166f3c3..4c6314763aa117c465e77783b4a94d1129abbb39 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -47,7 +47,6 @@ gem 'rack-attack'
 gem 'rack-cors', require: 'rack/cors'
 gem 'sidekiq'
 gem 'sidekiq-unique-jobs'
-gem 'sidekiq-merger'
 gem 'rails-settings-cached'
 gem 'simple-navigation'
 gem 'statsd-instrument'

diff --git a/Gemfile.lock b/Gemfile.lock
index 27de1bee085874c07d242da3c75032dfd7265abe..26c7b9962e0545e286b29e8467d8235d181351c5 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -387,10 +387,6 @@ GEM
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
       redis (~> 3.2, >= 3.2.1)
-    sidekiq-merger (0.0.11)
-      activesupport (>= 3.2, < 6)
-      concurrent-ruby (~> 1.0)
-      sidekiq (>= 3.4, < 5)
     sidekiq-unique-jobs (4.0.18)
       sidekiq (>= 2.6)
       thor
@@ -517,7 +513,6 @@ DEPENDENCIES
   sass-rails (~> 5.0)
   sdoc (~> 0.4.0)
   sidekiq
-  sidekiq-merger
   sidekiq-unique-jobs
   simple-navigation
   simple_form