mastofe

commit: 38b504b7a70c5b100396f36d4c6c6762542984c9
parent: 82aaedec467815c2947a11651d5216bb88ce4038
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Tue,  4 Apr 2017 14:28:57 +0200

Remove sidekiq-merger

Diffstat:
M
Gemfile
1
-
M
Gemfile.lock
5
-----

2 files changed, 0 insertions(+), 6 deletions(-)
diff --git 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
@@ -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