ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove sidekiq-merger

rebase/4.0.0rc2
Eugen Rochko 2017-04-04 14:28:57 +02:00
parent 82aaedec46
commit 38b504b7a7
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@ -47,7 +47,6 @@ gem 'rack-attack'
gem 'rack-cors', require: 'rack/cors' gem 'rack-cors', require: 'rack/cors'
gem 'sidekiq' gem 'sidekiq'
gem 'sidekiq-unique-jobs' gem 'sidekiq-unique-jobs'
gem 'sidekiq-merger'
gem 'rails-settings-cached' gem 'rails-settings-cached'
gem 'simple-navigation' gem 'simple-navigation'
gem 'statsd-instrument' gem 'statsd-instrument'

5
Gemfile.lock
View File

@ -387,10 +387,6 @@ GEM
connection_pool (~> 2.2, >= 2.2.0) connection_pool (~> 2.2, >= 2.2.0)
rack-protection (>= 1.5.0) rack-protection (>= 1.5.0)
redis (~> 3.2, >= 3.2.1) 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-unique-jobs (4.0.18)
sidekiq (>= 2.6) sidekiq (>= 2.6)
thor thor
@ -517,7 +513,6 @@ DEPENDENCIES
sass-rails (~> 5.0) sass-rails (~> 5.0)
sdoc (~> 0.4.0) sdoc (~> 0.4.0)
sidekiq sidekiq
sidekiq-merger
sidekiq-unique-jobs sidekiq-unique-jobs
simple-navigation simple-navigation
simple_form simple_form