Skip to content

Commit

Permalink
3384 – update rails to ~> 6.1.7 (#365)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
vasconsaurus authored Jul 19, 2023
1 parent 0ea2556 commit e82abb4
Show file tree
Hide file tree
Showing 2 changed files with 174 additions and 172 deletions.
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ group :development do
end
group :test do
gem 'parallel_tests'
gem "mocha", "~> 1.14.0", require: false
gem "mocha", '~> 1.14.0', require: false
gem 'simplecov', '0.13.0', require: false
gem 'simplecov-console', require: false
gem 'codeclimate-test-reporter', '1.0.8', group: :test, require: nil
Expand Down Expand Up @@ -46,7 +46,7 @@ gem 'retryable'
gem 'puma', '5.6.4'
gem 'rack-cors', :require => 'rack/cors'
gem 'rails-perftest'
gem 'sidekiq'
gem 'sidekiq', '< 7'
gem 'redis', '4.3.1'
gem 'nokogiri', '1.14.3', require: false
gem 'htmlentities', require: false
Expand All @@ -73,7 +73,7 @@ gem 'opentelemetry-instrumentation-rack'
gem 'opentelemetry-instrumentation-rails'
gem 'opentelemetry-instrumentation-rake'
gem 'opentelemetry-instrumentation-sidekiq'
gem 'addressable'
gem 'addressable', '2.8.1'
# Adding this removes some deprecation warnings, caused by double-loading of the net-protocol library
# (see https://github.com/ruby/net-imap/issues/16). We *might* be able to remove this after upgrading to Ruby 3
gem 'net-http'
Loading

0 comments on commit e82abb4

Please sign in to comment.