about summary refs log tree commit diff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-04-04 14:28:57 +0200
committerEugen Rochko <eugen@zeonfederated.com>2017-04-04 14:28:57 +0200
commit38b504b7a70c5b100396f36d4c6c6762542984c9 (patch)
tree4f2ca06ecc326a2d2055ff814aecc0e1bd648f0a /Gemfile.lock
parent82aaedec467815c2947a11651d5216bb88ce4038 (diff)
Remove sidekiq-merger
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock5
1 files changed, 0 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 27de1bee0..26c7b9962 100644
--- 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