diff --git a/Appraisals b/Appraisals index 112766ead..396784e3d 100644 --- a/Appraisals +++ b/Appraisals @@ -2,6 +2,7 @@ appraise 'rails-6.0' do gem 'rails', '~> 6.0.0' + gem 'concurrent-ruby', '1.3.4' # Workaround for https://github.com/rails/rails/issues/54260 gem 'psych', '~> 3.3' gem 'turbo-rails', '< 2.0.8' @@ -31,6 +32,7 @@ end appraise 'rails-6.1' do gem 'rails', '~> 6.1.0' + gem 'concurrent-ruby', '1.3.4' # Workaround for https://github.com/rails/rails/issues/54260 group :active_record do platforms :jruby do @@ -52,8 +54,10 @@ appraise 'rails-6.1' do end appraise 'rails-7.0' do - gem 'rails', '~> 7.0.0' + gem 'rails', '~> 7.0.0', '7.0.8.6' # Pinning until the fix for https://github.com/basecamp/trix/issues/1209 become available in actiontext + gem 'concurrent-ruby', '1.3.4' # Workaround for https://github.com/rails/rails/issues/54260 gem 'importmap-rails', require: false + gem 'nokogiri', '~> 1.16.0', platform: :jruby group :active_record do platforms :ruby, :mswin, :mingw, :x64_mingw do @@ -110,7 +114,8 @@ appraise 'rails-8.0' do end appraise 'composite_primary_keys' do - gem 'rails', '~> 7.0.0' + gem 'rails', '~> 7.0.0', '7.0.8.6' # Pinning until the fix for https://github.com/basecamp/trix/issues/1209 become available in actiontext + gem 'concurrent-ruby', '1.3.4' # Workaround for https://github.com/rails/rails/issues/54260 group :active_record do gem 'composite_primary_keys' diff --git a/gemfiles/composite_primary_keys.gemfile b/gemfiles/composite_primary_keys.gemfile index 1ebba5c55..bcdbf29ec 100644 --- a/gemfiles/composite_primary_keys.gemfile +++ b/gemfiles/composite_primary_keys.gemfile @@ -5,12 +5,13 @@ source "https://rubygems.org" gem "appraisal", ">= 2.0" gem "devise", "~> 4.7" gem "net-smtp", require: false -gem "rails", "~> 7.0.0" +gem "rails", "~> 7.0.0", "7.0.8.6" gem "sassc-rails", "~> 2.1" gem "turbo-rails" gem "vite_rails", require: false gem "webpacker", require: false gem "webrick" +gem "concurrent-ruby", "1.3.4" group :development, :test do gem "pry", ">= 0.9" diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile index 75954b32e..da86b4c65 100644 --- a/gemfiles/rails_6.0.gemfile +++ b/gemfiles/rails_6.0.gemfile @@ -11,6 +11,7 @@ gem "turbo-rails", "< 2.0.8" gem "vite_rails", require: false gem "webpacker", require: false gem "webrick" +gem "concurrent-ruby", "1.3.4" gem "psych", "~> 3.3" group :development, :test do diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index cdf08f0c8..8c883fc89 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -11,6 +11,7 @@ gem "turbo-rails" gem "vite_rails", require: false gem "webpacker", require: false gem "webrick" +gem "concurrent-ruby", "1.3.4" group :development, :test do gem "pry", ">= 0.9" diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile index 36f7ff8cf..1804f839b 100644 --- a/gemfiles/rails_7.0.gemfile +++ b/gemfiles/rails_7.0.gemfile @@ -5,13 +5,15 @@ source "https://rubygems.org" gem "appraisal", ">= 2.0" gem "devise", "~> 4.7" gem "net-smtp", require: false -gem "rails", "~> 7.0.0" +gem "rails", "~> 7.0.0", "7.0.8.6" gem "sassc-rails", "~> 2.1" gem "turbo-rails" gem "vite_rails", require: false gem "webpacker", require: false gem "webrick" +gem "concurrent-ruby", "1.3.4" gem "importmap-rails", require: false +gem "nokogiri", "~> 1.16.0", platform: :jruby group :development, :test do gem "pry", ">= 0.9"