diff --git a/Gemfile b/Gemfile index f1c93f93..00f727a5 100644 --- a/Gemfile +++ b/Gemfile @@ -97,7 +97,7 @@ gem 'builder' gem 'activeresource' gem 'geocoder' #gem 'dimensions' -gem 'sidekiq', '~> 4.2' +gem 'sidekiq', '~> 5.2' gem 'sidekiq-failures' gem 'sidekiq-history' gem 'sidekiq-status' diff --git a/Gemfile.lock b/Gemfile.lock index d0358a40..ace85eca 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,8 +25,17 @@ GIT railties (>= 3.2) GEM - remote: https://rubygems.org/ remote: http://dream.misasa.okayama-u.ac.jp/rubygems/ + specs: + acts_as_mappable (0.1.5) + actionpack (>= 6.1.0) + activerecord (>= 6.1.0) + railties (>= 6.1.0) + with_recursive (0.0.7) + activerecord (>= 6.1.0) + +GEM + remote: https://rubygems.org/ specs: Ascii85 (1.1.0) actioncable (6.1.3.1) @@ -100,10 +109,6 @@ GEM activerecord (>= 5.0, < 6.2) acts_as_list (1.0.3) activerecord (>= 4.2) - acts_as_mappable (0.1.5) - actionpack (>= 6.1.0) - activerecord (>= 6.1.0) - railties (>= 6.1.0) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) afm (0.2.2) @@ -176,8 +181,8 @@ GEM color_code (0.4.0) comma (4.5.0) activesupport (>= 4.2.0, < 6.2) - concurrent-ruby (1.1.8) - connection_pool (2.2.3) + concurrent-ruby (1.1.9) + connection_pool (2.2.5) crack (0.4.5) rexml crass (1.0.6) @@ -413,7 +418,7 @@ GEM rblineprof (0.3.7) debugger-ruby_core_source (~> 1.3) rdoc (6.3.0) - redis (3.3.5) + redis (4.1.4) ref (2.0.0) regexp_parser (2.0.3) request_store (1.5.0) @@ -470,11 +475,11 @@ GEM semantic_range (2.3.1) settingslogic (2.0.9) shellany (0.0.1) - sidekiq (4.2.10) - concurrent-ruby (~> 1.0) - connection_pool (~> 2.2, >= 2.2.0) + sidekiq (5.2.9) + connection_pool (~> 2.2, >= 2.2.2) + rack (~> 2.0) rack-protection (>= 1.5.0) - redis (~> 3.2, >= 3.2.1) + redis (>= 3.3.5, < 4.2) sidekiq-failures (1.0.0) sidekiq (>= 4.0.0) sidekiq-history (0.0.11) @@ -565,8 +570,6 @@ GEM websocket-extensions (0.1.5) whenever (1.0.0) chronic (>= 0.6.3) - with_recursive (0.0.7) - activerecord (>= 6.1.0) xpath (3.2.0) nokogiri (~> 1.8) zeitwerk (2.4.2) @@ -637,7 +640,7 @@ DEPENDENCIES sass-rails (~> 5.1) sdoc settingslogic - sidekiq (~> 4.2) + sidekiq (~> 5.2) sidekiq-failures sidekiq-history sidekiq-status