Skip to content

Commit b0ad364

Browse files
authored
Merge pull request #1631 from coderdojo-japan/update-rails-7.0
Update rails 7.0
2 parents ae32e2c + 9b86ba4 commit b0ad364

17 files changed

+323
-230
lines changed

Gemfile

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
11
source 'https://rubygems.org'
22
ruby '3.1.6'
33

4-
gem 'rails', '~> 6.1'
5-
gem 'puma'
6-
gem "puma_worker_killer"
7-
gem 'pg'
84
gem 'bootsnap'
5+
gem 'pg'
6+
gem 'puma'
7+
gem 'puma_worker_killer'
8+
gem 'rails', '~> 7.0'
99

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

14-
gem 'simple_grid_rails'
15-
gem "bootstrap-sass"
16-
gem 'sass-rails', '>= 5'
17-
gem 'uglifier'
14+
gem 'bootstrap-sass'
1815
gem 'font-awesome-rails'
1916
gem 'haml-rails'
2017
gem 'rails-html-sanitizer', '~> 1.4.4'
18+
gem 'sass-rails', '>= 5'
19+
gem 'simple_grid_rails'
20+
gem 'uglifier'
2121

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

2628
# For redirection
2729
gem 'rack-host-redirect'
@@ -39,14 +41,14 @@ gem 'kramdown-parser-gfm'
3941
gem 'faraday'
4042
gem 'faraday_middleware'
4143

44+
gem 'google_drive'
4245
gem 'koala'
43-
gem 'rack-user_agent'
46+
gem 'lazy_high_charts', '1.5.8'
4447
gem 'rack-attack'
45-
gem 'google_drive'
46-
gem 'lazy_high_charts', "1.5.8"
48+
gem 'rack-user_agent'
4749

4850
# For RSS feed
49-
gem 'ruby-mp3info', :require => 'mp3info'
51+
gem 'ruby-mp3info', require: 'mp3info'
5052

5153
# For Sitemap (Google Search Console)
5254
gem 'sitemap_generator'
@@ -61,30 +63,30 @@ gem 'net-http'
6163
gem 'uri'
6264

6365
group :development do
64-
gem 'web-console'
65-
gem "solargraph"
66-
gem 'spring'
67-
gem 'listen'
68-
gem 'letter_opener_web'
69-
gem 'stackprof', require: false
7066
gem 'flamegraph', require: false
71-
gem 'memory_profiler', require: false
67+
gem 'letter_opener_web'
68+
gem 'listen'
69+
gem 'memory_profiler', require: false
7270
gem 'rack-mini-profiler', require: false
71+
gem 'solargraph'
72+
gem 'spring'
73+
gem 'stackprof', require: false
74+
gem 'web-console'
7375
end
7476

7577
group :development, :test do
76-
gem 'pry-rails'
78+
gem 'minitest-retry'
7779
gem 'pry-byebug'
7880
gem 'pry-doc'
81+
gem 'pry-rails'
7982
gem 'pry-stack_explorer'
8083
gem 'rake'
81-
gem 'minitest-retry'
8284
gem 'rspec-retry'
8385

84-
gem 'selenium-webdriver'
8586
gem 'capybara'
86-
gem 'rspec-rails', '~> 4.0'
8787
gem 'factory_bot_rails'
88+
gem 'rspec-rails', '~> 4.0'
89+
gem 'selenium-webdriver'
8890

8991
gem 'dotenv-rails'
9092
end

0 commit comments

Comments
 (0)