Skip to content

Upgrade Ruby on Rails: 6.2 -> 7.0 #1631

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.

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 20 commits into from
Nov 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
217ffa1
update ruby version 3.1.6
nanophate Sep 18, 2024
0dabce2
update gem to rails 7.0
nanophate Sep 18, 2024
1d3a5d1
app:update bin/setup
nanophate Sep 18, 2024
29b52bc
app:update config/environments/development.rb
nanophate Sep 18, 2024
f9767bd
app:update config/environments/production.rb
nanophate Sep 18, 2024
58bab53
app:update config/environments/test.rb
nanophate Sep 18, 2024
d935753
app:update config/initializers/assets.rb
nanophate Sep 18, 2024
c399269
app:update config/initializers/content_security_policy.rb
nanophate Sep 18, 2024
6d4ecc1
app:update config/initializers/filter_parameter_logging.rb
nanophate Sep 18, 2024
d573bdb
app:update config/initializers/inflections.rb
nanophate Sep 18, 2024
105d203
app:update db/schema.rb
nanophate Sep 18, 2024
e20dbd6
app:update config/initializers/new_framework_defaults_7_0.rb
nanophate Sep 18, 2024
7556876
workaround rambulance load timming issue
nanophate Sep 18, 2024
b1fa9d4
remove js compressor replicating production config
nanophate Oct 20, 2024
e100021
match heroku-22 stack to match production
nanophate Oct 20, 2024
45d49d9
Change rambulance to yasslab/rambulance to mitigate the nameerror iss…
nanophate Oct 21, 2024
4a7f426
Update to Rails 7
nanophate Oct 21, 2024
afad8dc
Merge branch 'main' into update-rails-7.0
nanophate Nov 10, 2024
59fae65
remove already enable pramswrapper 'https://github.com/coderdojo-japa…
nanophate Nov 10, 2024
9b86ba4
remove already enable cookies_serializer format 'https://github.com/c…
nanophate Nov 10, 2024
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
50 changes: 26 additions & 24 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
source 'https://rubygems.org'
ruby '3.1.6'

gem 'rails', '~> 6.1'
gem 'puma'
gem "puma_worker_killer"
gem 'pg'
gem 'bootsnap'
gem 'pg'
gem 'puma'
gem 'puma_worker_killer'
gem 'rails', '~> 7.0'

gem 'coffee-rails'
gem 'jbuilder'
gem 'jquery-rails'

gem 'simple_grid_rails'
gem "bootstrap-sass"
gem 'sass-rails', '>= 5'
gem 'uglifier'
gem 'bootstrap-sass'
gem 'font-awesome-rails'
gem 'haml-rails'
gem 'rails-html-sanitizer', '~> 1.4.4'
gem 'sass-rails', '>= 5'
gem 'simple_grid_rails'
gem 'uglifier'

# For handling error
# https://github.com/yuki24/rambulance
gem 'rambulance'
# Using patch gem due to NameError: uninitialized constant ApplicationHelper
# https://github.com/coderdojo-japan/coderdojo.jp/pull/1631#issuecomment-2424826474
gem 'rambulance', git: 'https://github.com/yasslab/rambulance'

# For redirection
gem 'rack-host-redirect'
Expand All @@ -39,14 +41,14 @@ gem 'kramdown-parser-gfm'
gem 'faraday'
gem 'faraday_middleware'

gem 'google_drive'
gem 'koala'
gem 'rack-user_agent'
gem 'lazy_high_charts', '1.5.8'
gem 'rack-attack'
gem 'google_drive'
gem 'lazy_high_charts', "1.5.8"
gem 'rack-user_agent'

# For RSS feed
gem 'ruby-mp3info', :require => 'mp3info'
gem 'ruby-mp3info', require: 'mp3info'

# For Sitemap (Google Search Console)
gem 'sitemap_generator'
Expand All @@ -61,30 +63,30 @@ gem 'net-http'
gem 'uri'

group :development do
gem 'web-console'
gem "solargraph"
gem 'spring'
gem 'listen'
gem 'letter_opener_web'
gem 'stackprof', require: false
gem 'flamegraph', require: false
gem 'memory_profiler', require: false
gem 'letter_opener_web'
gem 'listen'
gem 'memory_profiler', require: false
gem 'rack-mini-profiler', require: false
gem 'solargraph'
gem 'spring'
gem 'stackprof', require: false
gem 'web-console'
end

group :development, :test do
gem 'pry-rails'
gem 'minitest-retry'
gem 'pry-byebug'
gem 'pry-doc'
gem 'pry-rails'
gem 'pry-stack_explorer'
gem 'rake'
gem 'minitest-retry'
gem 'rspec-retry'

gem 'selenium-webdriver'
gem 'capybara'
gem 'rspec-rails', '~> 4.0'
gem 'factory_bot_rails'
gem 'rspec-rails', '~> 4.0'
gem 'selenium-webdriver'

gem 'dotenv-rails'
end
Expand Down
Loading