Skip to content

Commit 58b23ae

Browse files
larouxnlarouxn
authored
Upgrade rails from 8.0.4.1 to 8.0.5, minitest from 5.27.0 to 6.0.2, connection_pool from 2.5.5 to 3.0.2 (#6364)
* Upgrade rails from 8.0.4.1 to 8.0.5 https://github.com/rails/rails/releases/tag/v8.0.5 * Upgrade minitest from 5.27.0 to 6.0.2 Release notes - https://github.com/minitest/minitest/blob/a2d0904767e058c962dda89e37192097cce14de2/History.rdoc#600--2025-12-17 Additional changes - one test that improperly asserted nil instead of an actual token - moved two methods from private to public as assert_predicate no longer works with private methods * Upgrade connection_pool from 2.5.5 to 3.0.2 https://github.com/mperham/connection_pool/blob/f3645821d02fe8de5089f31b61600a1f6217afb1/Changes.md#300
1 parent b2b5001 commit 58b23ae

4 files changed

Lines changed: 85 additions & 83 deletions

File tree

‎Gemfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ source "https://rubygems.org"
44

55
ruby file: ".ruby-version"
66

7-
gem "rails", "~> 8.0.3"
7+
gem "rails", "~> 8.0.5"
88
gem "rails-i18n", "~> 8.1.0"
99

1010
gem "aws-sdk-s3", "~> 1.217"
@@ -68,7 +68,6 @@ gem "faraday-multipart", "~> 1.2"
6868
gem "sigstore", "~> 0.2.3"
6969
gem "kramdown", "~> 2.5"
7070
gem "zlib", "~> 3.2"
71-
gem "connection_pool", "~> 2.0" # TODO: Remove when Rails makes new release after (16/12/2025)
7271
gem "yaml-schema", "~> 1.2"
7372

7473
# Admin dashboard
@@ -138,7 +137,7 @@ group :development do
138137
end
139138

140139
group :test do
141-
gem "minitest", "~> 5.27", require: false
140+
gem "minitest", "~> 6.0", require: false
142141
gem "minitest-retry", "~> 0.3.1"
143142
gem "capybara", "~> 3.40"
144143
gem "launchy", "~> 3.1"

‎Gemfile.lock‎

Lines changed: 75 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -29,68 +29,68 @@ GEM
2929
GEM
3030
remote: https://rubygems.org/
3131
specs:
32-
actioncable (8.0.4.1)
33-
actionpack (= 8.0.4.1)
34-
activesupport (= 8.0.4.1)
32+
actioncable (8.0.5)
33+
actionpack (= 8.0.5)
34+
activesupport (= 8.0.5)
3535
nio4r (~> 2.0)
3636
websocket-driver (>= 0.6.1)
3737
zeitwerk (~> 2.6)
38-
actionmailbox (8.0.4.1)
39-
actionpack (= 8.0.4.1)
40-
activejob (= 8.0.4.1)
41-
activerecord (= 8.0.4.1)
42-
activestorage (= 8.0.4.1)
43-
activesupport (= 8.0.4.1)
38+
actionmailbox (8.0.5)
39+
actionpack (= 8.0.5)
40+
activejob (= 8.0.5)
41+
activerecord (= 8.0.5)
42+
activestorage (= 8.0.5)
43+
activesupport (= 8.0.5)
4444
mail (>= 2.8.0)
45-
actionmailer (8.0.4.1)
46-
actionpack (= 8.0.4.1)
47-
actionview (= 8.0.4.1)
48-
activejob (= 8.0.4.1)
49-
activesupport (= 8.0.4.1)
45+
actionmailer (8.0.5)
46+
actionpack (= 8.0.5)
47+
actionview (= 8.0.5)
48+
activejob (= 8.0.5)
49+
activesupport (= 8.0.5)
5050
mail (>= 2.8.0)
5151
rails-dom-testing (~> 2.2)
52-
actionpack (8.0.4.1)
53-
actionview (= 8.0.4.1)
54-
activesupport (= 8.0.4.1)
52+
actionpack (8.0.5)
53+
actionview (= 8.0.5)
54+
activesupport (= 8.0.5)
5555
nokogiri (>= 1.8.5)
5656
rack (>= 2.2.4)
5757
rack-session (>= 1.0.1)
5858
rack-test (>= 0.6.3)
5959
rails-dom-testing (~> 2.2)
6060
rails-html-sanitizer (~> 1.6)
6161
useragent (~> 0.16)
62-
actiontext (8.0.4.1)
63-
actionpack (= 8.0.4.1)
64-
activerecord (= 8.0.4.1)
65-
activestorage (= 8.0.4.1)
66-
activesupport (= 8.0.4.1)
62+
actiontext (8.0.5)
63+
actionpack (= 8.0.5)
64+
activerecord (= 8.0.5)
65+
activestorage (= 8.0.5)
66+
activesupport (= 8.0.5)
6767
globalid (>= 0.6.0)
6868
nokogiri (>= 1.8.5)
69-
actionview (8.0.4.1)
70-
activesupport (= 8.0.4.1)
69+
actionview (8.0.5)
70+
activesupport (= 8.0.5)
7171
builder (~> 3.1)
7272
erubi (~> 1.11)
7373
rails-dom-testing (~> 2.2)
7474
rails-html-sanitizer (~> 1.6)
7575
active_link_to (1.0.5)
7676
actionpack
7777
addressable
78-
activejob (8.0.4.1)
79-
activesupport (= 8.0.4.1)
78+
activejob (8.0.5)
79+
activesupport (= 8.0.5)
8080
globalid (>= 0.3.6)
81-
activemodel (8.0.4.1)
82-
activesupport (= 8.0.4.1)
83-
activerecord (8.0.4.1)
84-
activemodel (= 8.0.4.1)
85-
activesupport (= 8.0.4.1)
81+
activemodel (8.0.5)
82+
activesupport (= 8.0.5)
83+
activerecord (8.0.5)
84+
activemodel (= 8.0.5)
85+
activesupport (= 8.0.5)
8686
timeout (>= 0.4.0)
87-
activestorage (8.0.4.1)
88-
actionpack (= 8.0.4.1)
89-
activejob (= 8.0.4.1)
90-
activerecord (= 8.0.4.1)
91-
activesupport (= 8.0.4.1)
87+
activestorage (8.0.5)
88+
actionpack (= 8.0.5)
89+
activejob (= 8.0.5)
90+
activerecord (= 8.0.5)
91+
activesupport (= 8.0.5)
9292
marcel (~> 1.0)
93-
activesupport (8.0.4.1)
93+
activesupport (8.0.5)
9494
base64
9595
benchmark (>= 0.3)
9696
bigdecimal
@@ -99,7 +99,7 @@ GEM
9999
drb
100100
i18n (>= 1.6, < 2)
101101
logger (>= 1.4.2)
102-
minitest (>= 5.1, < 6)
102+
minitest (>= 5.1)
103103
securerandom (>= 0.3)
104104
tzinfo (~> 2.0, >= 2.0.5)
105105
uri (>= 0.13.1)
@@ -202,7 +202,7 @@ GEM
202202
railties (>= 5.0)
203203
compact_index (0.15.0)
204204
concurrent-ruby (1.3.6)
205-
connection_pool (2.5.5)
205+
connection_pool (3.0.2)
206206
cose (1.3.1)
207207
cbor (~> 0.5.9)
208208
openssl-signature_algorithm (~> 1.0)
@@ -474,7 +474,9 @@ GEM
474474
mini_histogram (0.3.1)
475475
mini_mime (1.1.5)
476476
mini_portile2 (2.8.9)
477-
minitest (5.27.0)
477+
minitest (6.0.2)
478+
drb (~> 2.0)
479+
prism (~> 1.5)
478480
minitest-gcstats (1.3.2)
479481
minitest (> 5.0)
480482
minitest-reporters (1.7.1)
@@ -647,20 +649,20 @@ GEM
647649
rack (>= 1.3)
648650
rackup (2.3.1)
649651
rack (>= 3)
650-
rails (8.0.4.1)
651-
actioncable (= 8.0.4.1)
652-
actionmailbox (= 8.0.4.1)
653-
actionmailer (= 8.0.4.1)
654-
actionpack (= 8.0.4.1)
655-
actiontext (= 8.0.4.1)
656-
actionview (= 8.0.4.1)
657-
activejob (= 8.0.4.1)
658-
activemodel (= 8.0.4.1)
659-
activerecord (= 8.0.4.1)
660-
activestorage (= 8.0.4.1)
661-
activesupport (= 8.0.4.1)
652+
rails (8.0.5)
653+
actioncable (= 8.0.5)
654+
actionmailbox (= 8.0.5)
655+
actionmailer (= 8.0.5)
656+
actionpack (= 8.0.5)
657+
actiontext (= 8.0.5)
658+
actionview (= 8.0.5)
659+
activejob (= 8.0.5)
660+
activemodel (= 8.0.5)
661+
activerecord (= 8.0.5)
662+
activestorage (= 8.0.5)
663+
activesupport (= 8.0.5)
662664
bundler (>= 1.15.0)
663-
railties (= 8.0.4.1)
665+
railties (= 8.0.5)
664666
rails-controller-testing (1.0.5)
665667
actionpack (>= 5.0.1.rc1)
666668
actionview (>= 5.0.1.rc1)
@@ -684,9 +686,9 @@ GEM
684686
rack
685687
railties (>= 5.1)
686688
semantic_logger (~> 4.16)
687-
railties (8.0.4.1)
688-
actionpack (= 8.0.4.1)
689-
activesupport (= 8.0.4.1)
689+
railties (8.0.5)
690+
actionpack (= 8.0.5)
691+
activesupport (= 8.0.5)
690692
irb (~> 1.13)
691693
rackup (>= 1.0.0)
692694
rake (>= 12.2)
@@ -940,7 +942,6 @@ DEPENDENCIES
940942
chartkick (~> 5.2)
941943
clearance (~> 2.11)
942944
compact_index (~> 0.15.0)
943-
connection_pool (~> 2.0)
944945
csv (~> 3.3)
945946
dalli (~> 3.2)
946947
datadog (~> 2.30)
@@ -978,7 +979,7 @@ DEPENDENCIES
978979
mail (~> 2.9)
979980
maintenance_tasks (~> 2.14)
980981
memory_profiler (~> 1.1)
981-
minitest (~> 5.27)
982+
minitest (~> 6.0)
982983
minitest-gcstats (~> 1.3)
983984
minitest-reporters (~> 1.7)
984985
minitest-retry (~> 0.3.1)
@@ -1008,7 +1009,7 @@ DEPENDENCIES
10081009
rack-sanitizer (~> 2.0)
10091010
rack-test (~> 2.2)
10101011
rackup (~> 2.3)
1011-
rails (~> 8.0.3)
1012+
rails (~> 8.0.5)
10121013
rails-controller-testing (~> 1.0)
10131014
rails-erd (~> 1.7)
10141015
rails-i18n (~> 8.1.0)
@@ -1048,18 +1049,18 @@ DEPENDENCIES
10481049
zlib (~> 3.2)
10491050

10501051
CHECKSUMS
1051-
actioncable (8.0.4.1) sha256=426f0cfa0e725cef4f6518ab24f7dd0290dded630fc39615f364fba9846f6c53
1052-
actionmailbox (8.0.4.1) sha256=604ec3836b79a383312cec2ca8d678695149b7d7de4c375d76b4535c034695c8
1053-
actionmailer (8.0.4.1) sha256=90db7874504c7679dffeaa3ba0e8e824d0327898b59acbce221c735ea85e7d8f
1054-
actionpack (8.0.4.1) sha256=f1c8b3673340f8f478a083ae55c58ad6989455d7daad554ff64d70af36302c7d
1055-
actiontext (8.0.4.1) sha256=6abf7368f4dfe82290cfb9f18982174fb5632d9a5ebf5f2791332fbd4e4c250d
1056-
actionview (8.0.4.1) sha256=bdd726498c12174c4ba8fb489c630ea9bf2f4db1f09d59ec227f318d1ec78d80
1052+
actioncable (8.0.5) sha256=01a1d1a48b63b1a643fae6b7b4eb2859af55f507b335fca9ab869a5c6742bb8b
1053+
actionmailbox (8.0.5) sha256=2651a87c0cc3dd1243a3afe64c052e71138f99006b3a5d3fa519198735500054
1054+
actionmailer (8.0.5) sha256=7918fac842cfe985ed21692f3d212c914a0c816e30e6fa68633177bb22f38561
1055+
actionpack (8.0.5) sha256=c9de868975dd124a0956499140bd5e63c367865deca01292df7c3195c8da4b35
1056+
actiontext (8.0.5) sha256=12f3ce3d6326230728316ba14eeac27b2100d6e7d9bfcb4b01fb27b187a812e1
1057+
actionview (8.0.5) sha256=6d0fa9e63df0cf2729b1f54d0988336c149eb2bbc6049f4c2834d7b62f351413
10571058
active_link_to (1.0.5) sha256=4830847b3d14589df1e9fc62038ceec015257fce975ec1c2a77836c461b139ba
1058-
activejob (8.0.4.1) sha256=1980d6241c9aeae112943de960bc8c41cf1c3741408c60709caed7a795976fb9
1059-
activemodel (8.0.4.1) sha256=1ee25e1241bfd48b2682fa14aadb399065dc4f045dc234422344c408b3394af5
1060-
activerecord (8.0.4.1) sha256=182582af961c3877017477d1ff14bba7fabc634ba4e3f257da4d8aab963ae7bd
1061-
activestorage (8.0.4.1) sha256=f2dcbe57643957922c9cbe676baef673a14003fcefd22174661599e74f20731e
1062-
activesupport (8.0.4.1) sha256=822187e99ebca3e90bf03e6ccef5b57447592657f6b1676ccaaa25794ebfc7e6
1059+
activejob (8.0.5) sha256=2dabe5c3bfe284aba4687c52b930564335435dde3a60b047821f9d3bd0d2ea10
1060+
activemodel (8.0.5) sha256=c796813d46dc1373f4c6c0ec91dfc520b53683ea773c3b3f9a12c4b3eb145bc2
1061+
activerecord (8.0.5) sha256=89b261b6cd910c9431cf2475f3f6e5e2f5ce589805043a33ef2b004376a129e6
1062+
activestorage (8.0.5) sha256=25898a3f8f8aced15ea6a8578cb56955acf3a96ad931e000b2e77e9c8db43df3
1063+
activesupport (8.0.5) sha256=37f213ff6a37cf3fadfa1a28c1a9678e2cb73b59bb9ebd0eeeca653cccadcb23
10631064
addressable (2.8.9) sha256=cc154fcbe689711808a43601dee7b980238ce54368d23e127421753e46895485
10641065
aes_key_wrap (1.1.0) sha256=b935f4756b37375895db45669e79dfcdc0f7901e12d4e08974d5540c8e0776a5
10651066
aggregate_assertions (0.3.0) sha256=a5ad621c4b0c451bbd8cf520d5f98caa56882043114954a8725aedd3cba1db11
@@ -1105,7 +1106,7 @@ CHECKSUMS
11051106
clearance (2.11.0) sha256=c198711033c095cf127ea076f6afd4b52723548992b5d40bc1d2e3a28e9b0c79
11061107
compact_index (0.15.0) sha256=5c6c404afca8928a7d9f4dde9524f6e1610db17e675330803055db282da84a8b
11071108
concurrent-ruby (1.3.6) sha256=6b56837e1e7e5292f9864f34b69c5a2cbc75c0cf5338f1ce9903d10fa762d5ab
1108-
connection_pool (2.5.5) sha256=e54ff92855753df1fd7c59fa04a398833355f27dd14c074f8c83a05f72a716ad
1109+
connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a
11091110
cose (1.3.1) sha256=d5d4dbcd6b035d513edc4e1ab9bc10e9ce13b4011c96e3d1b8fe5e6413fd6de5
11101111
crack (1.0.1) sha256=ff4a10390cd31d66440b7524eb1841874db86201d5b70032028553130b6d4c7e
11111112
crass (1.0.6) sha256=dc516022a56e7b3b156099abc81b6d2b08ea1ed12676ac7a5657617f012bd45d
@@ -1220,7 +1221,7 @@ CHECKSUMS
12201221
mini_histogram (0.3.1) sha256=6a114b504e4618b0e076cc672996036870f7cc6f16b8e5c25c0c637726d2dd94
12211222
mini_mime (1.1.5) sha256=8681b7e2e4215f2a159f9400b5816d85e9d8c6c6b491e96a12797e798f8bccef
12221223
mini_portile2 (2.8.9) sha256=0cd7c7f824e010c072e33f68bc02d85a00aeb6fce05bb4819c03dfd3c140c289
1223-
minitest (5.27.0) sha256=2d3b17f8a36fe7801c1adcffdbc38233b938eb0b4966e97a6739055a45fa77d5
1224+
minitest (6.0.2) sha256=db6e57956f6ecc6134683b4c87467d6dd792323c7f0eea7b93f66bd284adbc3d
12241225
minitest-gcstats (1.3.2) sha256=56d299805738622b2975ac6c141d5aedd81d3bec3fd8e05d4f926c3787f68867
12251226
minitest-reporters (1.7.1) sha256=5060413a0c95b8c32fe73e0606f3631c173a884d7900e50013e15094eb50562c
12261227
minitest-retry (0.3.1) sha256=9b8282c5c1684a04b330526b90f39e42b7cec1b91abf70af6526e64131df186f
@@ -1296,14 +1297,14 @@ CHECKSUMS
12961297
rack-session (2.1.1) sha256=0b6dc07dea7e4b583f58a48e8b806d4c9f1c6c9214ebc202ec94562cbea2e4e9
12971298
rack-test (2.2.0) sha256=005a36692c306ac0b4a9350355ee080fd09ddef1148a5f8b2ac636c720f5c463
12981299
rackup (2.3.1) sha256=6c79c26753778e90983761d677a48937ee3192b3ffef6bc963c0950f94688868
1299-
rails (8.0.4.1) sha256=1de7e890f93925cabacb9be3a061a01bc86d686429152ccf7835206ab91b1795
1300+
rails (8.0.5) sha256=4cb40f90948be292fa15cc7cb37757b97266585145c6e76957464b40edfd5be6
13001301
rails-controller-testing (1.0.5) sha256=741448db59366073e86fc965ba403f881c636b79a2c39a48d0486f2607182e94
13011302
rails-dom-testing (2.3.0) sha256=8acc7953a7b911ca44588bf08737bc16719f431a1cc3091a292bca7317925c1d
13021303
rails-erd (1.7.2) sha256=0b17d0fba25d319d8da8af7a3e5e2149d02d6187cc7351e8be43423f07c48bcd
13031304
rails-html-sanitizer (1.7.0) sha256=28b145cceaf9cc214a9874feaa183c3acba036c9592b19886e0e45efc62b1e89
13041305
rails-i18n (8.1.0) sha256=52d5fd6c0abef28d84223cc05647f6ae0fd552637a1ede92deee9545755b6cf3
13051306
rails_semantic_logger (4.19.0) sha256=e75e562c68a32abb6a8615940afd7d40c082cff786b8d7b50ff1f7462eff3c16
1306-
railties (8.0.4.1) sha256=bdc4034d63f04f2bad26fbf9faa924701dba04f71fcdd746884ff0871a63818c
1307+
railties (8.0.5) sha256=ad98c6e9a096b7e8cf63c70872b60ec6c1d4152be2a4ffa63483ec02a837a9d5
13071308
rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
13081309
rake (13.3.1) sha256=8c9e89d09f66a26a01264e7e3480ec0607f0c497a861ef16063604b1b08eb19c
13091310
ransack (4.4.1) sha256=6aeaac36fc19088570e10da1044e6cfd88c740e20f871b84566fd30e32b7a63d

‎app/models/concerns/user_multifactor_methods.rb‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,6 @@ def reset_mfa_attributes
8080
self.mfa_hashed_recovery_codes = []
8181
end
8282

83-
private
84-
85-
def strong_mfa_level?
86-
mfa_ui_and_gem_signin? || mfa_ui_and_api?
87-
end
88-
8983
def mfa_recommended?
9084
return false if strong_mfa_level? || mfa_required?
9185

@@ -98,6 +92,12 @@ def mfa_required?
9892
rubygems.mfa_required.any?
9993
end
10094

95+
private
96+
97+
def strong_mfa_level?
98+
mfa_ui_and_gem_signin? || mfa_ui_and_api?
99+
end
100+
101101
def mfa_level_for_enabled_devices
102102
return if correct_mfa_level_set_conditions
103103

‎test/functional/compromised_passwords_controller_test.rb‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ class CompromisedPasswordsControllerTest < ActionController::TestCase
3232
end
3333

3434
should "not update user confirmation_token on page visit" do
35+
@user.update!(confirmation_token: "this-is-a-test-token")
36+
3537
original_token = @user.confirmation_token
3638

3739
get :show

0 commit comments

Comments
 (0)