diff --git a/Gemfile b/Gemfile index 9a3a4803f..83bb35bc2 100644 --- a/Gemfile +++ b/Gemfile @@ -95,7 +95,7 @@ gem "rack-cors", require: "rack/cors" gem "raddocs" # action cable currently requires redis < 5. This should be fixed in rails >= 7.0.4 # relevant issue: https://github.com/redis/redis-rb/issues/1142 -gem "redis", "< 5" +gem "redis", "< 6" gem "rest-client", "~> 2.1.0" gem "rollbar" gem "rubyzip", ">= 1.2.2" diff --git a/Gemfile.lock b/Gemfile.lock index fc64cad48..035fa3df8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,8 +1,8 @@ GEM remote: https://gems.contribsys.com/ specs: - sidekiq-pro (5.5.8) - sidekiq (~> 6.0, >= 6.5.6) + sidekiq-pro (7.2.0) + sidekiq (>= 7.2.0, < 8) GEM remote: https://rubygems.org/ @@ -123,9 +123,6 @@ GEM msgpack (~> 1.2) brakeman (6.1.2) racc - brpoplpush-redis_script (0.1.3) - concurrent-ruby (~> 1.0, >= 1.0.5) - redis (>= 1.0, < 6) builder (3.2.4) bundler-audit (0.9.1) bundler (>= 1.2.0, < 3) @@ -398,7 +395,10 @@ GEM ffi (~> 1.0) rdoc (6.6.3.1) psych (>= 4.0.0) - redis (4.8.1) + redis (5.2.0) + redis-client (>= 0.22.0) + redis-client (0.22.1) + connection_pool regexp_parser (2.9.1) reline (0.5.4) io-console (~> 0.5) @@ -473,18 +473,17 @@ GEM ruby2_keywords (0.0.5) rubyzip (2.3.2) shellany (0.0.1) - sidekiq (6.5.12) - connection_pool (>= 2.2.5, < 3) - rack (~> 2.0) - redis (>= 4.5.0, < 5) + sidekiq (7.2.4) + concurrent-ruby (< 2) + connection_pool (>= 2.3.0) + rack (>= 2.2.4) + redis-client (>= 0.19.0) sidekiq-failures (1.0.4) sidekiq (>= 4.0.0) - sidekiq-unique-jobs (7.1.33) - brpoplpush-redis_script (> 0.1.1, <= 2.0.0) + sidekiq-unique-jobs (8.0.10) concurrent-ruby (~> 1.0, >= 1.0.5) - redis (< 5.0) - sidekiq (>= 5.0, < 7.0) - thor (>= 0.20, < 3.0) + sidekiq (>= 7.0.0, < 8.0.0) + thor (>= 1.0, < 3.0) signet (0.19.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) @@ -606,7 +605,7 @@ DEPENDENCIES rack-cors raddocs rails (~> 7.0.8) - redis (< 5) + redis (< 6) rest-client (~> 2.1.0) rollbar rspec