Skip to content

Commit 59a2110

Browse files
authored
Merge pull request #66 from alphagov/upgrade-rails-8.0.5
Upgrade rails 8.0.5
2 parents 2f65891 + f6e3609 commit 59a2110

4 files changed

Lines changed: 88 additions & 72 deletions

File tree

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source "https://rubygems.org"
22

33
# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
4-
gem "rails", "8.0.3"
4+
gem "rails", "8.0.5"
55
# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
66
gem "sprockets-rails"
77
# Use sqlite3 as the database for Active Record

Gemfile.lock

Lines changed: 72 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,65 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (8.0.3)
5-
actionpack (= 8.0.3)
6-
activesupport (= 8.0.3)
4+
actioncable (8.0.5)
5+
actionpack (= 8.0.5)
6+
activesupport (= 8.0.5)
77
nio4r (~> 2.0)
88
websocket-driver (>= 0.6.1)
99
zeitwerk (~> 2.6)
10-
actionmailbox (8.0.3)
11-
actionpack (= 8.0.3)
12-
activejob (= 8.0.3)
13-
activerecord (= 8.0.3)
14-
activestorage (= 8.0.3)
15-
activesupport (= 8.0.3)
10+
actionmailbox (8.0.5)
11+
actionpack (= 8.0.5)
12+
activejob (= 8.0.5)
13+
activerecord (= 8.0.5)
14+
activestorage (= 8.0.5)
15+
activesupport (= 8.0.5)
1616
mail (>= 2.8.0)
17-
actionmailer (8.0.3)
18-
actionpack (= 8.0.3)
19-
actionview (= 8.0.3)
20-
activejob (= 8.0.3)
21-
activesupport (= 8.0.3)
17+
actionmailer (8.0.5)
18+
actionpack (= 8.0.5)
19+
actionview (= 8.0.5)
20+
activejob (= 8.0.5)
21+
activesupport (= 8.0.5)
2222
mail (>= 2.8.0)
2323
rails-dom-testing (~> 2.2)
24-
actionpack (8.0.3)
25-
actionview (= 8.0.3)
26-
activesupport (= 8.0.3)
24+
actionpack (8.0.5)
25+
actionview (= 8.0.5)
26+
activesupport (= 8.0.5)
2727
nokogiri (>= 1.8.5)
2828
rack (>= 2.2.4)
2929
rack-session (>= 1.0.1)
3030
rack-test (>= 0.6.3)
3131
rails-dom-testing (~> 2.2)
3232
rails-html-sanitizer (~> 1.6)
3333
useragent (~> 0.16)
34-
actiontext (8.0.3)
35-
actionpack (= 8.0.3)
36-
activerecord (= 8.0.3)
37-
activestorage (= 8.0.3)
38-
activesupport (= 8.0.3)
34+
actiontext (8.0.5)
35+
actionpack (= 8.0.5)
36+
activerecord (= 8.0.5)
37+
activestorage (= 8.0.5)
38+
activesupport (= 8.0.5)
3939
globalid (>= 0.6.0)
4040
nokogiri (>= 1.8.5)
41-
actionview (8.0.3)
42-
activesupport (= 8.0.3)
41+
actionview (8.0.5)
42+
activesupport (= 8.0.5)
4343
builder (~> 3.1)
4444
erubi (~> 1.11)
4545
rails-dom-testing (~> 2.2)
4646
rails-html-sanitizer (~> 1.6)
47-
activejob (8.0.3)
48-
activesupport (= 8.0.3)
47+
activejob (8.0.5)
48+
activesupport (= 8.0.5)
4949
globalid (>= 0.3.6)
50-
activemodel (8.0.3)
51-
activesupport (= 8.0.3)
52-
activerecord (8.0.3)
53-
activemodel (= 8.0.3)
54-
activesupport (= 8.0.3)
50+
activemodel (8.0.5)
51+
activesupport (= 8.0.5)
52+
activerecord (8.0.5)
53+
activemodel (= 8.0.5)
54+
activesupport (= 8.0.5)
5555
timeout (>= 0.4.0)
56-
activestorage (8.0.3)
57-
actionpack (= 8.0.3)
58-
activejob (= 8.0.3)
59-
activerecord (= 8.0.3)
60-
activesupport (= 8.0.3)
56+
activestorage (8.0.5)
57+
actionpack (= 8.0.5)
58+
activejob (= 8.0.5)
59+
activerecord (= 8.0.5)
60+
activesupport (= 8.0.5)
6161
marcel (~> 1.0)
62-
activesupport (8.0.3)
62+
activesupport (8.0.5)
6363
base64
6464
benchmark (>= 0.3)
6565
bigdecimal
@@ -111,7 +111,7 @@ GEM
111111
docile (1.4.1)
112112
domain_name (0.6.20240107)
113113
drb (2.2.3)
114-
erb (6.0.1)
114+
erb (6.0.2)
115115
erb_lint (0.9.0)
116116
activesupport
117117
better_html (>= 2.0.1)
@@ -255,7 +255,7 @@ GEM
255255
logstasher (2.1.5)
256256
activesupport (>= 5.2)
257257
request_store
258-
loofah (2.25.0)
258+
loofah (2.25.1)
259259
crass (~> 1.0.2)
260260
nokogiri (>= 1.12.0)
261261
mail (2.9.0)
@@ -271,14 +271,15 @@ GEM
271271
mime-types-data (~> 3.2025, >= 3.2025.0507)
272272
mime-types-data (3.2025.0924)
273273
mini_mime (1.1.5)
274-
minitest (6.0.1)
274+
minitest (6.0.2)
275+
drb (~> 2.0)
275276
prism (~> 1.5)
276277
msgpack (1.8.0)
277278
multi_xml (0.7.2)
278279
bigdecimal (~> 3.1)
279280
net-http (0.9.1)
280281
uri (>= 0.11.1)
281-
net-imap (0.6.2)
282+
net-imap (0.6.3)
282283
date
283284
net-protocol
284285
net-pop (0.1.2)
@@ -296,21 +297,21 @@ GEM
296297
govspeak (>= 10.6.3)
297298
rails (>= 6, < 8.1.3)
298299
view_component (~> 4)
299-
nokogiri (1.19.1-aarch64-linux-gnu)
300+
nokogiri (1.19.2-aarch64-linux-gnu)
300301
racc (~> 1.4)
301-
nokogiri (1.19.1-aarch64-linux-musl)
302+
nokogiri (1.19.2-aarch64-linux-musl)
302303
racc (~> 1.4)
303-
nokogiri (1.19.1-arm-linux-gnu)
304+
nokogiri (1.19.2-arm-linux-gnu)
304305
racc (~> 1.4)
305-
nokogiri (1.19.1-arm-linux-musl)
306+
nokogiri (1.19.2-arm-linux-musl)
306307
racc (~> 1.4)
307-
nokogiri (1.19.1-arm64-darwin)
308+
nokogiri (1.19.2-arm64-darwin)
308309
racc (~> 1.4)
309-
nokogiri (1.19.1-x86_64-darwin)
310+
nokogiri (1.19.2-x86_64-darwin)
310311
racc (~> 1.4)
311-
nokogiri (1.19.1-x86_64-linux-gnu)
312+
nokogiri (1.19.2-x86_64-linux-gnu)
312313
racc (~> 1.4)
313-
nokogiri (1.19.1-x86_64-linux-musl)
314+
nokogiri (1.19.2-x86_64-linux-musl)
314315
racc (~> 1.4)
315316
null_logger (0.0.1)
316317
oauth2 (2.0.18)
@@ -518,7 +519,7 @@ GEM
518519
pp (0.6.3)
519520
prettyprint
520521
prettyprint (0.2.0)
521-
prism (1.6.0)
522+
prism (1.9.0)
522523
prometheus_exporter (2.3.1)
523524
webrick
524525
psych (5.3.1)
@@ -542,30 +543,30 @@ GEM
542543
rack (>= 1.3)
543544
rackup (2.3.1)
544545
rack (>= 3)
545-
rails (8.0.3)
546-
actioncable (= 8.0.3)
547-
actionmailbox (= 8.0.3)
548-
actionmailer (= 8.0.3)
549-
actionpack (= 8.0.3)
550-
actiontext (= 8.0.3)
551-
actionview (= 8.0.3)
552-
activejob (= 8.0.3)
553-
activemodel (= 8.0.3)
554-
activerecord (= 8.0.3)
555-
activestorage (= 8.0.3)
556-
activesupport (= 8.0.3)
546+
rails (8.0.5)
547+
actioncable (= 8.0.5)
548+
actionmailbox (= 8.0.5)
549+
actionmailer (= 8.0.5)
550+
actionpack (= 8.0.5)
551+
actiontext (= 8.0.5)
552+
actionview (= 8.0.5)
553+
activejob (= 8.0.5)
554+
activemodel (= 8.0.5)
555+
activerecord (= 8.0.5)
556+
activestorage (= 8.0.5)
557+
activesupport (= 8.0.5)
557558
bundler (>= 1.15.0)
558-
railties (= 8.0.3)
559+
railties (= 8.0.5)
559560
rails-dom-testing (2.3.0)
560561
activesupport (>= 5.0.0)
561562
minitest
562563
nokogiri (>= 1.6)
563-
rails-html-sanitizer (1.6.2)
564-
loofah (~> 2.21)
564+
rails-html-sanitizer (1.7.0)
565+
loofah (~> 2.25)
565566
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
566-
railties (8.0.3)
567-
actionpack (= 8.0.3)
568-
activesupport (= 8.0.3)
567+
railties (8.0.5)
568+
actionpack (= 8.0.5)
569+
activesupport (= 8.0.5)
569570
irb (~> 1.13)
570571
rackup (>= 1.0.0)
571572
rake (>= 12.2)
@@ -715,7 +716,7 @@ GEM
715716
terser (1.2.7)
716717
execjs (>= 0.3.0, < 3)
717718
thor (1.5.0)
718-
timeout (0.6.0)
719+
timeout (0.6.1)
719720
tsort (0.2.0)
720721
tzinfo (2.0.6)
721722
concurrent-ruby (~> 1.0)
@@ -743,7 +744,7 @@ GEM
743744
websocket-extensions (0.1.5)
744745
xpath (3.2.0)
745746
nokogiri (~> 1.8)
746-
zeitwerk (2.7.4)
747+
zeitwerk (2.7.5)
747748

748749
PLATFORMS
749750
aarch64-linux
@@ -775,7 +776,7 @@ DEPENDENCIES
775776
nokodiff
776777
pg
777778
plek
778-
rails (= 8.0.3)
779+
rails (= 8.0.5)
779780
rspec-rails
780781
rubocop-govuk
781782
sentry-sidekiq

bin/brakeman

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/env ruby
2+
require "rubygems"
3+
require "bundler/setup"
4+
5+
ARGV.unshift("--ensure-latest")
6+
7+
load Gem.bin_path("brakeman", "brakeman")

bin/rubocop

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/usr/bin/env ruby
2+
require "rubygems"
3+
require "bundler/setup"
4+
5+
# explicit rubocop config increases performance slightly while avoiding config confusion.
6+
ARGV.unshift("--config", File.expand_path("../.rubocop.yml", __dir__))
7+
8+
load Gem.bin_path("rubocop", "rubocop")

0 commit comments

Comments
 (0)