Skip to content

Update master #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 18, 2025
Merged

Update master #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
74fd7ef
Pin Rails 7.0 to work around the error 'DOMPurify is not defined'
mshibuya Jan 13, 2025
c25f517
Pin Nokogiri version on JRuby to work around the issues in spec
mshibuya Jan 13, 2025
1b2a8ba
Fix Rails <= 7.0 builds failing due to change in concurrent-ruby
mshibuya Mar 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Appraisals
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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'
Expand Down
3 changes: 2 additions & 1 deletion gemfiles/composite_primary_keys.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails_6.0.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails_6.1.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 3 additions & 1 deletion gemfiles/rails_7.0.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading