diff --git a/Gemfile b/Gemfile index 4c808b06e..cf996cffb 100644 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,7 @@ gem 'groupdate' gem "chartkick" gem 'rubyzip', '>= 1.0.0' -gem 'sidekiq', '< 5' +gem 'sidekiq', '< 6' gem 'sidekiq-status' gem 'sidekiq-unique-jobs', '~> 4.0.17' gem 'redis-rails', '~> 4.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index ee8d13fa1..03f6964d9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -142,8 +142,8 @@ GEM execjs coffee-script-source (1.12.2) columnize (0.8.9) - concurrent-ruby (1.1.5) - connection_pool (2.2.0) + concurrent-ruby (1.1.10) + connection_pool (2.2.5) coveralls (0.7.1) multi_json (~> 1.3) rest-client @@ -329,7 +329,7 @@ GEM rack-cors (0.3.0) rack-livereload (0.3.11) rack - rack-protection (1.4.0) + rack-protection (1.5.5) rack rack-test (0.6.3) rack (>= 1.0) @@ -352,7 +352,7 @@ GEM thor (>= 0.18.1, < 2.0) rainbow (2.0.0) rake (10.0.4) - redis (3.3.0) + redis (4.7.1) redis-actionpack (4.0.1) actionpack (~> 4) redis-rack (~> 1.5.0) @@ -419,10 +419,11 @@ GEM thor (~> 0.14) sentient_user (0.3.3) railties (>= 3.1) - sidekiq (4.1.1) - concurrent-ruby (~> 1.0) - connection_pool (~> 2.2, >= 2.2.0) - redis (~> 3.2, >= 3.2.1) + sidekiq (5.2.8) + connection_pool (~> 2.2, >= 2.2.2) + rack (< 2.1.0) + rack-protection (>= 1.5.0) + redis (>= 3.3.5, < 5) sidekiq-status (0.6.0) sidekiq (>= 2.7) sidekiq-unique-jobs (4.0.18) @@ -594,7 +595,7 @@ DEPENDENCIES rubyzip (>= 1.0.0) sass-rails (~> 5.0.0) select2-rails (~> 3.5.4) - sidekiq (< 5) + sidekiq (< 6) sidekiq-status sidekiq-unique-jobs (~> 4.0.17) simplecov