Skip to content

Commit dfb61dd

Browse files
authored
Merge pull request #1686 from coderdojo-japan/upgrade-to-rails-7-1
Upgrade Ruby on Rails: 7.0 -> 7.1
2 parents 040ce5f + ab4e73b commit dfb61dd

19 files changed

+591
-222
lines changed

Gemfile

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,21 @@ gem 'bootsnap'
55
gem 'pg'
66
gem 'puma'
77
gem 'puma_worker_killer'
8-
gem 'rails', '~> 7.0'
8+
gem 'rails', '~> 7.1.0'
99

1010
gem 'coffee-rails'
1111
gem 'jbuilder'
1212
gem 'jquery-rails'
1313

1414
gem 'bootstrap-sass'
1515
gem 'font-awesome-rails'
16-
gem 'rails-html-sanitizer', '~> 1.4.4'
16+
gem 'rails-html-sanitizer'
1717
gem 'sass-rails', '>= 5'
1818
gem 'simple_grid_rails'
1919
gem 'uglifier'
2020

21-
# Specify to 1.3.4 to prevent error
22-
# TODO: This can be removed on Rails 7.1
23-
# https://github.com/rails/rails/issues/54260
24-
# https://stackoverflow.com/questions/79360526/uninitialized-constant-activesupportloggerthreadsafelevellogger-nameerror
25-
gem 'concurrent-ruby', '1.3.4'
21+
# Rails 7.1では不要になったため、バージョン制限を解除
22+
gem 'concurrent-ruby'
2623

2724
# For handling error
2825
# https://github.com/yuki24/rambulance
@@ -93,7 +90,7 @@ group :development, :test do
9390

9491
gem 'capybara'
9592
gem 'factory_bot_rails'
96-
gem 'rspec-rails', '~> 4.0'
93+
gem 'rspec-rails', '~> 5.0'
9794
gem 'selenium-webdriver'
9895

9996
gem 'dotenv-rails'

0 commit comments

Comments
 (0)