Skip to content

Commit 68ce782

Browse files
committed
Upgrade to Rails 8.0 and apply new framework defaults
* Disable cache_store during tests and re-enable it only explicitly
1 parent 41e5d07 commit 68ce782

24 files changed

+745
-436
lines changed

Gemfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ gem 'proformaxml', '~> 1.5.1'
3636
gem 'prometheus_exporter'
3737
gem 'puma'
3838
gem 'pundit'
39-
gem 'rails', '~> 7.2.2'
40-
gem 'rails_admin'
39+
gem 'rails', '~> 8.0.0'
40+
gem 'rails_admin', github: 'railsadminteam/rails_admin'
4141
gem 'rails-i18n'
4242
gem 'rails-timeago'
4343
gem 'ransack'
@@ -74,8 +74,6 @@ group :development, :staging do
7474
gem 'i18n-tasks'
7575
gem 'letter_opener'
7676
gem 'listen'
77-
gem 'pry-byebug'
78-
gem 'pry-rails'
7977
gem 'rack-mini-profiler'
8078
gem 'rubocop'
8179
gem 'rubocop-capybara'

Gemfile.lock

Lines changed: 86 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -6,73 +6,84 @@ GIT
66
rack (>= 1.5.0)
77
websocket (>= 1.1.0)
88

9+
GIT
10+
remote: https://github.com/railsadminteam/rails_admin.git
11+
revision: e38c12d98e3e11b858d2f3caa752013b7478f926
12+
specs:
13+
rails_admin (3.2.1)
14+
activemodel-serializers-xml (>= 1.0)
15+
csv
16+
kaminari (>= 0.14, < 2.0)
17+
nested_form (~> 0.3)
18+
rails (>= 6.0, < 9)
19+
turbo-rails (>= 1.0, < 3)
20+
921
GEM
1022
remote: https://rubygems.org/
1123
specs:
12-
actioncable (7.2.2)
13-
actionpack (= 7.2.2)
14-
activesupport (= 7.2.2)
24+
actioncable (8.0.0)
25+
actionpack (= 8.0.0)
26+
activesupport (= 8.0.0)
1527
nio4r (~> 2.0)
1628
websocket-driver (>= 0.6.1)
1729
zeitwerk (~> 2.6)
18-
actionmailbox (7.2.2)
19-
actionpack (= 7.2.2)
20-
activejob (= 7.2.2)
21-
activerecord (= 7.2.2)
22-
activestorage (= 7.2.2)
23-
activesupport (= 7.2.2)
30+
actionmailbox (8.0.0)
31+
actionpack (= 8.0.0)
32+
activejob (= 8.0.0)
33+
activerecord (= 8.0.0)
34+
activestorage (= 8.0.0)
35+
activesupport (= 8.0.0)
2436
mail (>= 2.8.0)
25-
actionmailer (7.2.2)
26-
actionpack (= 7.2.2)
27-
actionview (= 7.2.2)
28-
activejob (= 7.2.2)
29-
activesupport (= 7.2.2)
37+
actionmailer (8.0.0)
38+
actionpack (= 8.0.0)
39+
actionview (= 8.0.0)
40+
activejob (= 8.0.0)
41+
activesupport (= 8.0.0)
3042
mail (>= 2.8.0)
3143
rails-dom-testing (~> 2.2)
32-
actionpack (7.2.2)
33-
actionview (= 7.2.2)
34-
activesupport (= 7.2.2)
44+
actionpack (8.0.0)
45+
actionview (= 8.0.0)
46+
activesupport (= 8.0.0)
3547
nokogiri (>= 1.8.5)
36-
racc
37-
rack (>= 2.2.4, < 3.2)
48+
rack (>= 2.2.4)
3849
rack-session (>= 1.0.1)
3950
rack-test (>= 0.6.3)
4051
rails-dom-testing (~> 2.2)
4152
rails-html-sanitizer (~> 1.6)
4253
useragent (~> 0.16)
43-
actiontext (7.2.2)
44-
actionpack (= 7.2.2)
45-
activerecord (= 7.2.2)
46-
activestorage (= 7.2.2)
47-
activesupport (= 7.2.2)
54+
actiontext (8.0.0)
55+
actionpack (= 8.0.0)
56+
activerecord (= 8.0.0)
57+
activestorage (= 8.0.0)
58+
activesupport (= 8.0.0)
4859
globalid (>= 0.6.0)
4960
nokogiri (>= 1.8.5)
50-
actionview (7.2.2)
51-
activesupport (= 7.2.2)
61+
actionview (8.0.0)
62+
activesupport (= 8.0.0)
5263
builder (~> 3.1)
5364
erubi (~> 1.11)
5465
rails-dom-testing (~> 2.2)
5566
rails-html-sanitizer (~> 1.6)
56-
activejob (7.2.2)
57-
activesupport (= 7.2.2)
67+
activejob (8.0.0)
68+
activesupport (= 8.0.0)
5869
globalid (>= 0.3.6)
59-
activemodel (7.2.2)
60-
activesupport (= 7.2.2)
70+
activemodel (8.0.0)
71+
activesupport (= 8.0.0)
6172
activemodel-serializers-xml (1.0.3)
6273
activemodel (>= 5.0.0.a)
6374
activesupport (>= 5.0.0.a)
6475
builder (~> 3.1)
65-
activerecord (7.2.2)
66-
activemodel (= 7.2.2)
67-
activesupport (= 7.2.2)
76+
activerecord (8.0.0)
77+
activemodel (= 8.0.0)
78+
activesupport (= 8.0.0)
6879
timeout (>= 0.4.0)
69-
activestorage (7.2.2)
70-
actionpack (= 7.2.2)
71-
activejob (= 7.2.2)
72-
activerecord (= 7.2.2)
73-
activesupport (= 7.2.2)
80+
activestorage (8.0.0)
81+
actionpack (= 8.0.0)
82+
activejob (= 8.0.0)
83+
activerecord (= 8.0.0)
84+
activesupport (= 8.0.0)
7485
marcel (~> 1.0)
75-
activesupport (7.2.2)
86+
activesupport (8.0.0)
7687
base64
7788
benchmark (>= 0.3)
7889
bigdecimal
@@ -84,6 +95,7 @@ GEM
8495
minitest (>= 5.1)
8596
securerandom (>= 0.3)
8697
tzinfo (~> 2.0, >= 2.0.5)
98+
uri (>= 0.13.1)
8799
addressable (2.8.7)
88100
public_suffix (>= 2.0.2, < 7.0)
89101
amq-protocol (2.3.2)
@@ -109,7 +121,6 @@ GEM
109121
bunny (2.23.0)
110122
amq-protocol (~> 2.3, >= 2.3.1)
111123
sorted_set (~> 1, >= 1.0.2)
112-
byebug (11.1.3)
113124
capybara (3.40.0)
114125
addressable
115126
matrix
@@ -130,7 +141,6 @@ GEM
130141
childprocess (5.1.0)
131142
logger (~> 1.5)
132143
chronic (0.10.2)
133-
coderay (1.1.3)
134144
concurrent-ruby (1.3.4)
135145
connection_pool (2.4.1)
136146
crack (1.0.0)
@@ -140,7 +150,7 @@ GEM
140150
csv (3.3.0)
141151
dachsfisch (1.0.2)
142152
nokogiri (>= 1.14.1, < 2.0.0)
143-
date (3.4.0)
153+
date (3.4.1)
144154
debug_inspector (1.2.0)
145155
diff-lcs (1.5.1)
146156
docile (1.4.1)
@@ -152,7 +162,7 @@ GEM
152162
et-orbi (1.2.11)
153163
tzinfo
154164
eventmachine (1.2.7)
155-
excon (1.2.0)
165+
excon (1.2.2)
156166
execjs (2.10.0)
157167
factory_bot (6.5.0)
158168
activesupport (>= 5.0.0)
@@ -180,7 +190,7 @@ GEM
180190
globalid (1.2.1)
181191
activesupport (>= 6.1)
182192
hana (1.3.7)
183-
hashdiff (1.1.1)
193+
hashdiff (1.1.2)
184194
hashie (5.0.0)
185195
highline (3.1.1)
186196
reline
@@ -250,7 +260,7 @@ GEM
250260
listen (3.9.0)
251261
rb-fsevent (~> 0.10, >= 0.10.3)
252262
rb-inotify (~> 0.9, >= 0.9.10)
253-
logger (1.6.1)
263+
logger (1.6.2)
254264
loofah (2.23.1)
255265
crass (~> 1.0.2)
256266
nokogiri (>= 1.12.0)
@@ -261,7 +271,6 @@ GEM
261271
net-smtp
262272
marcel (1.0.4)
263273
matrix (0.4.2)
264-
method_source (1.1.0)
265274
mimemagic (0.4.3)
266275
nokogiri (~> 1)
267276
rake
@@ -272,12 +281,12 @@ GEM
272281
mnemosyne-ruby (2.0.0)
273282
activesupport (>= 6.1)
274283
bunny
275-
msgpack (1.7.3)
284+
msgpack (1.7.5)
276285
multi_json (1.15.0)
277286
multi_xml (0.7.1)
278287
bigdecimal (~> 3.1)
279288
nested_form (0.3.2)
280-
net-http (0.5.0)
289+
net-http (0.6.0)
281290
uri
282291
net-http-persistent (4.0.4)
283292
connection_pool (~> 2.2)
@@ -321,15 +330,8 @@ GEM
321330
rubyzip (>= 1.2.2, < 3.0.0)
322331
prometheus_exporter (2.1.1)
323332
webrick
324-
pry (0.14.2)
325-
coderay (~> 1.1)
326-
method_source (~> 1.0)
327-
pry-byebug (3.10.1)
328-
byebug (~> 11.0)
329-
pry (>= 0.13, < 0.15)
330-
pry-rails (0.3.11)
331-
pry (>= 0.13.0)
332-
psych (5.2.0)
333+
psych (5.2.1)
334+
date
333335
stringio
334336
public_suffix (6.0.1)
335337
puma (6.5.0)
@@ -349,20 +351,20 @@ GEM
349351
rack (>= 1.3)
350352
rackup (2.2.1)
351353
rack (>= 3)
352-
rails (7.2.2)
353-
actioncable (= 7.2.2)
354-
actionmailbox (= 7.2.2)
355-
actionmailer (= 7.2.2)
356-
actionpack (= 7.2.2)
357-
actiontext (= 7.2.2)
358-
actionview (= 7.2.2)
359-
activejob (= 7.2.2)
360-
activemodel (= 7.2.2)
361-
activerecord (= 7.2.2)
362-
activestorage (= 7.2.2)
363-
activesupport (= 7.2.2)
354+
rails (8.0.0)
355+
actioncable (= 8.0.0)
356+
actionmailbox (= 8.0.0)
357+
actionmailer (= 8.0.0)
358+
actionpack (= 8.0.0)
359+
actiontext (= 8.0.0)
360+
actionview (= 8.0.0)
361+
activejob (= 8.0.0)
362+
activemodel (= 8.0.0)
363+
activerecord (= 8.0.0)
364+
activestorage (= 8.0.0)
365+
activesupport (= 8.0.0)
364366
bundler (>= 1.15.0)
365-
railties (= 7.2.2)
367+
railties (= 8.0.0)
366368
rails-controller-testing (1.0.5)
367369
actionpack (>= 5.0.1.rc1)
368370
actionview (>= 5.0.1.rc1)
@@ -374,22 +376,15 @@ GEM
374376
rails-html-sanitizer (1.6.0)
375377
loofah (~> 2.21)
376378
nokogiri (~> 1.14)
377-
rails-i18n (7.0.10)
379+
rails-i18n (8.0.1)
378380
i18n (>= 0.7, < 2)
379-
railties (>= 6.0.0, < 8)
381+
railties (>= 8.0.0, < 9)
380382
rails-timeago (2.20.0)
381383
actionpack (>= 5.2)
382384
activesupport (>= 5.2)
383-
rails_admin (3.2.1)
384-
activemodel-serializers-xml (>= 1.0)
385-
csv
386-
kaminari (>= 0.14, < 2.0)
387-
nested_form (~> 0.3)
388-
rails (>= 6.0, < 8)
389-
turbo-rails (>= 1.0, < 3)
390-
railties (7.2.2)
391-
actionpack (= 7.2.2)
392-
activesupport (= 7.2.2)
385+
railties (8.0.0)
386+
actionpack (= 8.0.0)
387+
activesupport (= 8.0.0)
393388
irb (~> 1.13)
394389
rackup (>= 1.0.0)
395390
rake (>= 12.2)
@@ -407,11 +402,11 @@ GEM
407402
rbtree (0.4.6)
408403
rdoc (6.8.1)
409404
psych (>= 4.0.0)
410-
regexp_parser (2.9.2)
411-
reline (0.5.11)
405+
regexp_parser (2.9.3)
406+
reline (0.5.12)
412407
io-console (~> 0.5)
413408
rexml (3.3.9)
414-
rouge (4.4.0)
409+
rouge (4.5.1)
415410
rspec-collection_matchers (1.2.1)
416411
rspec-expectations (>= 2.99.0.beta1)
417412
rspec-core (3.13.2)
@@ -443,7 +438,7 @@ GEM
443438
rubocop-ast (>= 1.36.1, < 2.0)
444439
ruby-progressbar (~> 1.7)
445440
unicode-display_width (>= 2.4.0, < 4.0)
446-
rubocop-ast (1.36.1)
441+
rubocop-ast (1.36.2)
447442
parser (>= 3.3.1.0)
448443
rubocop-capybara (2.21.0)
449444
rubocop (~> 1.41)
@@ -477,7 +472,7 @@ GEM
477472
sprockets (> 3.0)
478473
sprockets-rails
479474
tilt
480-
securerandom (0.3.2)
475+
securerandom (0.4.0)
481476
selenium-webdriver (4.27.0)
482477
base64 (~> 0.2)
483478
logger (~> 1.4)
@@ -491,7 +486,7 @@ GEM
491486
sentry-ruby (5.21.0)
492487
bigdecimal
493488
concurrent-ruby (~> 1.0, >= 1.0.2)
494-
set (1.1.0)
489+
set (1.1.1)
495490
shakapacker (8.0.2)
496491
activesupport (>= 5.2)
497492
package_json
@@ -581,7 +576,7 @@ GEM
581576
addressable (>= 2.8.0)
582577
crack (>= 0.3.2)
583578
hashdiff (>= 0.4.0, < 2.0.0)
584-
webrick (1.9.0)
579+
webrick (1.9.1)
585580
websocket (1.2.11)
586581
websocket-driver (0.7.6)
587582
websocket-extensions (>= 0.1.0)
@@ -638,16 +633,14 @@ DEPENDENCIES
638633
pg
639634
proformaxml (~> 1.5.1)
640635
prometheus_exporter
641-
pry-byebug
642-
pry-rails
643636
puma
644637
pundit
645638
rack-mini-profiler
646-
rails (~> 7.2.2)
639+
rails (~> 8.0.0)
647640
rails-controller-testing
648641
rails-i18n
649642
rails-timeago
650-
rails_admin
643+
rails_admin!
651644
ransack
652645
rspec-collection_matchers
653646
rspec-github

bin/dev

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/usr/bin/env ruby
2+
exec "./bin/rails", "server", *ARGV

0 commit comments

Comments
 (0)