Skip to content

Commit e82abb4

Browse files
authored
3384 – update rails to ~> 6.1.7 (#365)
* update rails to 6.1.7.4 while keeping sidekiq under 7 delayed extensions was removed in sidekiq 7 and that breaks things for us https://github.com/sidekiq/sidekiq/blob/main/Changes.md#640 * downgrade addressable to 2.8.1 There seems to be a super old monkey patch in postrank that messes with the normalize method, starting at 2.8.2 version. Until postrank fixes that we can only go up to 2.8.1 relevant links: sporkmonger/addressable#513 sporkmonger/addressable#506 postrank-labs/postrank-uri#49
1 parent 0ea2556 commit e82abb4

File tree

2 files changed

+174
-172
lines changed

2 files changed

+174
-172
lines changed

Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ group :development do
1818
end
1919
group :test do
2020
gem 'parallel_tests'
21-
gem "mocha", "~> 1.14.0", require: false
21+
gem "mocha", '~> 1.14.0', require: false
2222
gem 'simplecov', '0.13.0', require: false
2323
gem 'simplecov-console', require: false
2424
gem 'codeclimate-test-reporter', '1.0.8', group: :test, require: nil
@@ -46,7 +46,7 @@ gem 'retryable'
4646
gem 'puma', '5.6.4'
4747
gem 'rack-cors', :require => 'rack/cors'
4848
gem 'rails-perftest'
49-
gem 'sidekiq'
49+
gem 'sidekiq', '< 7'
5050
gem 'redis', '4.3.1'
5151
gem 'nokogiri', '1.14.3', require: false
5252
gem 'htmlentities', require: false
@@ -73,7 +73,7 @@ gem 'opentelemetry-instrumentation-rack'
7373
gem 'opentelemetry-instrumentation-rails'
7474
gem 'opentelemetry-instrumentation-rake'
7575
gem 'opentelemetry-instrumentation-sidekiq'
76-
gem 'addressable'
76+
gem 'addressable', '2.8.1'
7777
# Adding this removes some deprecation warnings, caused by double-loading of the net-protocol library
7878
# (see https://github.com/ruby/net-imap/issues/16). We *might* be able to remove this after upgrading to Ruby 3
7979
gem 'net-http'

0 commit comments

Comments
 (0)