From 2201123e99ec20dd4104106b31868415e873d17f Mon Sep 17 00:00:00 2001 From: joescottdave Date: Mon, 18 May 2026 15:06:17 +0100 Subject: [PATCH 1/3] chore: update dependencies by minor version --- Gemfile.lock | 351 ++++++++++++++++++++++++++------------------------- 1 file changed, 178 insertions(+), 173 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 959f1f2..cacb8a9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,31 +1,31 @@ GEM remote: https://rubygems.org/ specs: - action_text-trix (2.1.15) + action_text-trix (2.1.19) railties - actioncable (8.1.1) - actionpack (= 8.1.1) - activesupport (= 8.1.1) + actioncable (8.1.3) + actionpack (= 8.1.3) + activesupport (= 8.1.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (8.1.1) - actionpack (= 8.1.1) - activejob (= 8.1.1) - activerecord (= 8.1.1) - activestorage (= 8.1.1) - activesupport (= 8.1.1) + actionmailbox (8.1.3) + actionpack (= 8.1.3) + activejob (= 8.1.3) + activerecord (= 8.1.3) + activestorage (= 8.1.3) + activesupport (= 8.1.3) mail (>= 2.8.0) - actionmailer (8.1.1) - actionpack (= 8.1.1) - actionview (= 8.1.1) - activejob (= 8.1.1) - activesupport (= 8.1.1) + actionmailer (8.1.3) + actionpack (= 8.1.3) + actionview (= 8.1.3) + activejob (= 8.1.3) + activesupport (= 8.1.3) mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (8.1.1) - actionview (= 8.1.1) - activesupport (= 8.1.1) + actionpack (8.1.3) + actionview (= 8.1.3) + activesupport (= 8.1.3) nokogiri (>= 1.8.5) rack (>= 2.2.4) rack-session (>= 1.0.1) @@ -33,36 +33,36 @@ GEM rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actiontext (8.1.1) + actiontext (8.1.3) action_text-trix (~> 2.1.15) - actionpack (= 8.1.1) - activerecord (= 8.1.1) - activestorage (= 8.1.1) - activesupport (= 8.1.1) + actionpack (= 8.1.3) + activerecord (= 8.1.3) + activestorage (= 8.1.3) + activesupport (= 8.1.3) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (8.1.1) - activesupport (= 8.1.1) + actionview (8.1.3) + activesupport (= 8.1.3) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (8.1.1) - activesupport (= 8.1.1) + activejob (8.1.3) + activesupport (= 8.1.3) globalid (>= 0.3.6) - activemodel (8.1.1) - activesupport (= 8.1.1) - activerecord (8.1.1) - activemodel (= 8.1.1) - activesupport (= 8.1.1) + activemodel (8.1.3) + activesupport (= 8.1.3) + activerecord (8.1.3) + activemodel (= 8.1.3) + activesupport (= 8.1.3) timeout (>= 0.4.0) - activestorage (8.1.1) - actionpack (= 8.1.1) - activejob (= 8.1.1) - activerecord (= 8.1.1) - activesupport (= 8.1.1) + activestorage (8.1.3) + actionpack (= 8.1.3) + activejob (= 8.1.3) + activerecord (= 8.1.3) + activesupport (= 8.1.3) marcel (~> 1.0) - activesupport (8.1.1) + activesupport (8.1.3) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.3.1) @@ -75,9 +75,9 @@ GEM securerandom (>= 0.3) tzinfo (~> 2.0, >= 2.0.5) uri (>= 0.13.1) - addressable (2.8.7) - public_suffix (>= 2.0.2, < 7.0) - ansi (1.5.0) + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + ansi (1.6.0) ast (2.4.3) autoprefixer-rails (10.4.21.0) execjs (~> 2) @@ -85,7 +85,7 @@ GEM base64 (0.3.0) benchmark (0.5.0) bigdecimal (3.3.1) - bootstrap (5.3.5) + bootstrap (5.3.8) popper_js (>= 2.11.8, < 3) builder (3.3.0) byebug (12.0.0) @@ -98,8 +98,8 @@ GEM rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - concurrent-ruby (1.3.5) - connection_pool (2.5.4) + concurrent-ruby (1.3.6) + connection_pool (2.5.5) crack (1.0.1) bigdecimal rexml @@ -111,34 +111,34 @@ GEM sprockets (> 3.0) sprockets-rails tilt - date (3.5.0) + date (3.5.1) diff-lcs (1.6.2) docile (1.4.1) - dotenv (3.1.8) + dotenv (3.2.0) drb (2.2.3) erb (5.1.3) erubi (1.13.1) - execjs (2.10.0) - faraday (2.14.0) + execjs (2.10.1) + faraday (2.14.2) faraday-net_http (>= 2.0, < 3.5) json logger faraday-encoding (0.0.6) faraday - faraday-follow_redirects (0.4.0) + faraday-follow_redirects (0.5.0) faraday (>= 1, < 3) - faraday-net_http (3.4.1) - net-http (>= 0.5.0) - faraday-retry (2.3.2) + faraday-net_http (3.4.2) + net-http (~> 0.5) + faraday-retry (2.4.0) faraday (~> 2.0) - ffi (1.17.2-aarch64-linux-gnu) - ffi (1.17.2-aarch64-linux-musl) - ffi (1.17.2-arm-linux-gnu) - ffi (1.17.2-arm-linux-musl) - ffi (1.17.2-arm64-darwin) - ffi (1.17.2-x86_64-darwin) - ffi (1.17.2-x86_64-linux-gnu) - ffi (1.17.2-x86_64-linux-musl) + ffi (1.17.4-aarch64-linux-gnu) + ffi (1.17.4-aarch64-linux-musl) + ffi (1.17.4-arm-linux-gnu) + ffi (1.17.4-arm-linux-musl) + ffi (1.17.4-arm64-darwin) + ffi (1.17.4-x86_64-darwin) + ffi (1.17.4-x86_64-linux-gnu) + ffi (1.17.4-x86_64-linux-musl) font-awesome-rails (4.7.0.9) railties (>= 3.2, < 9.0) get_process_mem (1.0.0) @@ -146,27 +146,27 @@ GEM ffi (~> 1.0) globalid (1.3.0) activesupport (>= 6.1) - google-protobuf (4.33.2) + google-protobuf (4.34.1) bigdecimal - rake (>= 13) - google-protobuf (4.33.2-aarch64-linux-gnu) + rake (~> 13.3) + google-protobuf (4.34.1-aarch64-linux-gnu) bigdecimal - rake (>= 13) - google-protobuf (4.33.2-aarch64-linux-musl) + rake (~> 13.3) + google-protobuf (4.34.1-aarch64-linux-musl) bigdecimal - rake (>= 13) - google-protobuf (4.33.2-arm64-darwin) + rake (~> 13.3) + google-protobuf (4.34.1-arm64-darwin) bigdecimal - rake (>= 13) - google-protobuf (4.33.2-x86_64-darwin) + rake (~> 13.3) + google-protobuf (4.34.1-x86_64-darwin) bigdecimal - rake (>= 13) - google-protobuf (4.33.2-x86_64-linux-gnu) + rake (~> 13.3) + google-protobuf (4.34.1-x86_64-linux-gnu) bigdecimal - rake (>= 13) - google-protobuf (4.33.2-x86_64-linux-musl) + rake (~> 13.3) + google-protobuf (4.34.1-x86_64-linux-musl) bigdecimal - rake (>= 13) + rake (~> 13.3) govuk_elements_rails (3.0.2) govuk_frontend_toolkit (>= 5.2.0) rails (>= 4.1.0) @@ -175,7 +175,7 @@ GEM railties (>= 3.1.0) govuk_template (0.26.0) rails (>= 3.1) - haml (7.0.1) + haml (7.2.0) temple (>= 0.8.2) thor tilt @@ -185,15 +185,16 @@ GEM haml (>= 4.0.6) railties (>= 5.1) hashdiff (1.2.1) - i18n (1.14.7) + i18n (1.14.8) concurrent-ruby (~> 1.0) - io-console (0.8.1) - irb (1.15.3) + io-console (0.8.2) + irb (1.18.0) pp (>= 0.6.0) + prism (>= 1.3.0) rdoc (>= 4.0.0) reline (>= 0.4.2) - jaro_winkler (1.6.1) - jbuilder (2.14.1) + jaro_winkler (1.7.0) + jbuilder (2.15.0) actionview (>= 7.0.0) activesupport (>= 7.0.0) jquery-rails (4.6.1) @@ -202,10 +203,10 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (8.0.0) railties (>= 3.2.16) - json (2.15.2) + json (2.19.5) json_expressions (0.9.0) - kramdown (2.5.1) - rexml (>= 3.3.9) + kramdown (2.5.2) + rexml (>= 3.4.4) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.5) @@ -218,7 +219,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.24.1) + loofah (2.25.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.9.0) @@ -230,26 +231,26 @@ GEM marcel (1.1.0) matrix (0.4.3) mini_mime (1.1.5) - minitest (5.26.0) + minitest (5.27.0) minitest-rails (8.1.0) minitest (~> 5.20) railties (>= 8.1.0, < 8.2.0) - minitest-reporters (1.7.1) + minitest-reporters (1.8.0) ansi builder - minitest (>= 5.0) + minitest (>= 5.0, < 7) ruby-progressbar minitest-spec-rails (7.4.1) minitest (>= 5.0) railties (>= 4.1) - mocha (2.7.1) + mocha (2.8.2) ruby2_keywords (>= 0.0.5) modernizr-rails (2.7.1) modulejs-rails (2.2.0.0) railties (>= 4.0) - net-http (0.7.0) - uri - net-imap (0.5.12) + net-http (0.9.1) + uri (>= 0.11.1) + net-imap (0.6.4) date net-protocol net-pop (0.1.2) @@ -259,77 +260,78 @@ GEM net-smtp (0.5.1) net-protocol nio4r (2.7.5) - nokogiri (1.18.10-aarch64-linux-gnu) + nokogiri (1.19.3-aarch64-linux-gnu) racc (~> 1.4) - nokogiri (1.18.10-aarch64-linux-musl) + nokogiri (1.19.3-aarch64-linux-musl) racc (~> 1.4) - nokogiri (1.18.10-arm-linux-gnu) + nokogiri (1.19.3-arm-linux-gnu) racc (~> 1.4) - nokogiri (1.18.10-arm-linux-musl) + nokogiri (1.19.3-arm-linux-musl) racc (~> 1.4) - nokogiri (1.18.10-arm64-darwin) + nokogiri (1.19.3-arm64-darwin) racc (~> 1.4) - nokogiri (1.18.10-x86_64-darwin) + nokogiri (1.19.3-x86_64-darwin) racc (~> 1.4) - nokogiri (1.18.10-x86_64-linux-gnu) + nokogiri (1.19.3-x86_64-linux-gnu) racc (~> 1.4) - nokogiri (1.18.10-x86_64-linux-musl) + nokogiri (1.19.3-x86_64-linux-musl) racc (~> 1.4) observer (0.1.2) + open3 (0.2.1) ostruct (0.6.3) - parallel (1.27.0) - parser (3.3.10.0) + parallel (1.28.0) + parser (3.3.11.1) ast (~> 2.4.1) racc popper_js (2.11.8) pp (0.6.3) prettyprint prettyprint (0.2.0) - prism (1.6.0) + prism (1.9.0) prometheus-client (4.2.5) base64 - psych (5.2.6) + psych (5.3.1) date stringio public_suffix (6.0.2) - puma (7.1.0) + puma (7.2.0) nio4r (~> 2.0) - puma-metrics (1.4.2) + puma-metrics (1.5.0) prometheus-client (>= 0.10) - puma (>= 6, != 7.0.0) + puma (>= 6.6.0, != 7.0.0) racc (1.8.1) - rack (3.2.4) - rack-session (2.1.1) + rack (3.2.6) + rack-session (2.1.2) base64 (>= 0.1.0) rack (>= 3.0.0) rack-test (2.2.0) rack (>= 1.3) - rackup (2.2.1) + rackup (2.3.1) rack (>= 3) - rails (8.1.1) - actioncable (= 8.1.1) - actionmailbox (= 8.1.1) - actionmailer (= 8.1.1) - actionpack (= 8.1.1) - actiontext (= 8.1.1) - actionview (= 8.1.1) - activejob (= 8.1.1) - activemodel (= 8.1.1) - activerecord (= 8.1.1) - activestorage (= 8.1.1) - activesupport (= 8.1.1) + rails (8.1.3) + actioncable (= 8.1.3) + actionmailbox (= 8.1.3) + actionmailer (= 8.1.3) + actionpack (= 8.1.3) + actiontext (= 8.1.3) + actionview (= 8.1.3) + activejob (= 8.1.3) + activemodel (= 8.1.3) + activerecord (= 8.1.3) + activestorage (= 8.1.3) + activesupport (= 8.1.3) bundler (>= 1.15.0) - railties (= 8.1.1) + railties (= 8.1.3) rails-dom-testing (2.3.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.6.2) - loofah (~> 2.21) + rails-html-sanitizer (1.7.0) + loofah (~> 2.25) 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) - railties (8.1.1) - actionpack (= 8.1.1) - activesupport (= 8.1.1) + railties (8.1.3) + actionpack (= 8.1.3) + activesupport (= 8.1.3) irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) @@ -337,68 +339,69 @@ GEM tsort (>= 0.2) zeitwerk (~> 2.6) rainbow (3.1.1) - rake (13.3.1) + rake (13.4.2) rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rbs (3.9.5) + rbs (3.10.4) logger - rdoc (6.15.1) + tsort + rdoc (6.17.0) erb psych (>= 4.0.0) tsort - regexp_parser (2.11.3) - reline (0.6.2) + regexp_parser (2.12.0) + reline (0.6.3) io-console (~> 0.5) request_store (1.7.0) rack (>= 1.4) - reverse_markdown (3.0.0) + reverse_markdown (3.0.2) nokogiri rexml (3.4.4) - rubocop (1.81.7) + rubocop (1.86.2) json (~> 2.3) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.1.0) - parallel (~> 1.10) + parallel (>= 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.47.1, < 2.0) + rubocop-ast (>= 1.49.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.47.1) + rubocop-ast (1.49.1) parser (>= 3.3.7.2) - prism (~> 1.4) - rubocop-rails (2.33.4) + prism (~> 1.7) + rubocop-rails (2.35.1) activesupport (>= 4.2.0) lint_roller (~> 1.1) rack (>= 1.1) rubocop (>= 1.75.0, < 2.0) rubocop-ast (>= 1.44.0, < 2.0) - ruby-lsp (0.26.2) + ruby-lsp (0.26.9) language_server-protocol (~> 3.17.0) prism (>= 1.2, < 2.0) rbs (>= 3, < 5) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) - rubyzip (3.2.2) + rubyzip (3.3.0) sass (3.7.4) sass-listen (~> 4.0.0) - sass-embedded (1.97.1-aarch64-linux-gnu) + sass-embedded (1.99.0-aarch64-linux-gnu) google-protobuf (~> 4.31) - sass-embedded (1.97.1-aarch64-linux-musl) + sass-embedded (1.99.0-aarch64-linux-musl) google-protobuf (~> 4.31) - sass-embedded (1.97.1-arm-linux-gnueabihf) + sass-embedded (1.99.0-arm-linux-gnueabihf) google-protobuf (~> 4.31) - sass-embedded (1.97.1-arm-linux-musleabihf) + sass-embedded (1.99.0-arm-linux-musleabihf) google-protobuf (~> 4.31) - sass-embedded (1.97.1-arm64-darwin) + sass-embedded (1.99.0-arm64-darwin) google-protobuf (~> 4.31) - sass-embedded (1.97.1-x86_64-darwin) + sass-embedded (1.99.0-x86_64-darwin) google-protobuf (~> 4.31) - sass-embedded (1.97.1-x86_64-linux-gnu) + sass-embedded (1.99.0-x86_64-linux-gnu) google-protobuf (~> 4.31) - sass-embedded (1.97.1-x86_64-linux-musl) + sass-embedded (1.99.0-x86_64-linux-musl) google-protobuf (~> 4.31) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -408,38 +411,41 @@ GEM sdoc (2.6.5) rdoc (>= 5.0) securerandom (0.4.1) - selenium-webdriver (4.38.0) + selenium-webdriver (4.44.0) base64 (~> 0.2) logger (~> 1.4) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 4.0) websocket (~> 1.0) - sentry-rails (6.0.0) + sentry-rails (6.5.0) railties (>= 5.2.0) - sentry-ruby (~> 6.0.0) - sentry-ruby (6.0.0) + sentry-ruby (~> 6.5.0) + sentry-ruby (6.5.0) bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + logger simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.13.2) simplecov_json_formatter (0.1.4) - solargraph (0.57.0) + solargraph (0.59.0) + ast (~> 2.4.3) backport (~> 1.2) benchmark (~> 0.4) - bundler (~> 2.0) + bundler (>= 2.0) diff-lcs (~> 1.4) jaro_winkler (~> 1.6, >= 1.6.1) kramdown (~> 2.3) kramdown-parser-gfm (~> 1.1) logger (~> 1.6) observer (~> 0.1) + open3 (~> 0.2.1) ostruct (~> 0.6) parser (~> 3.0) prism (~> 1.4) - rbs (>= 3.6.1, <= 4.0.0.dev.4) + rbs (>= 3.10.0) reverse_markdown (~> 3.0) rubocop (~> 1.76) thor (~> 1.0) @@ -455,23 +461,22 @@ GEM actionpack (>= 6.1) activesupport (>= 6.1) sprockets (>= 3.0.0) - stackprof (0.2.27) - stringio (3.1.7) + stackprof (0.2.28) + stringio (3.2.0) temple (0.10.4) - thor (1.4.0) - tilt (2.6.1) - timeout (0.4.4) + thor (1.5.0) + tilt (2.7.0) + timeout (0.6.1) tsort (0.2.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (3.2.0) unicode-emoji (~> 4.1) - unicode-emoji (4.1.0) - uri (1.1.0) + unicode-emoji (4.2.0) + uri (1.1.1) useragent (0.16.11) - vcr (6.3.1) - base64 - webmock (3.26.1) + vcr (6.4.0) + webmock (3.26.2) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -483,12 +488,12 @@ GEM xpath (3.2.0) nokogiri (~> 1.8) yajl-ruby (1.4.3) - yard (0.9.37) + yard (0.9.43) yard-activesupport-concern (0.0.1) yard (>= 0.8) yard-solargraph (0.1.0) yard (~> 0.9) - zeitwerk (2.7.3) + zeitwerk (2.8.0) GEM remote: https://rubygems.pkg.github.com/epimorphics/ @@ -500,11 +505,11 @@ GEM faraday-retry (~> 2.0, >= 2.0) json (~> 2.0) yajl-ruby (~> 1.4) - json_rails_logger (2.2.0) - json - lograge - railties - lr_common_styles (3.0.0) + json_rails_logger (2.3.0) + json (>= 1.8, < 5.0) + lograge (>= 0.10, < 2.0) + railties (>= 6.0, < 9.0) + lr_common_styles (3.0.1) bootstrap (~> 5.3.2) font-awesome-rails (~> 4.7.0) govuk_elements_rails (= 3.0.2) From 3c5525f653afe001d5052d38a3751c782af310e5 Mon Sep 17 00:00:00 2001 From: joescottdave Date: Mon, 18 May 2026 15:14:56 +0100 Subject: [PATCH 2/3] fix: add a temporary rubocop:disable Style/OneClassPerFile This code can be moved to the puma config files once we adopt `epilog_rails` in these applications. The instructions for it can be found there --- config/application.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/application.rb b/config/application.rb index 4b7c102..ae83e09 100644 --- a/config/application.rb +++ b/config/application.rb @@ -47,7 +47,8 @@ class Application < Rails::Application # Monkey-patch the bit of Rails that emits the start-up log message, so # that it is written out in JSON format that our combined logging # service can handle -module Rails +# TODO: remove this block once using `epilog_rails` +module Rails # rubocop:disable Style/OneClassPerFile # :nodoc: module Command # :nodoc: From 3c15e2ebf3d91d0aca7da625736cf9b148c45191 Mon Sep 17 00:00:00 2001 From: joescottdave Date: Mon, 18 May 2026 15:52:51 +0100 Subject: [PATCH 3/3] chore: update versions --- Dockerfile | 4 ++-- Makefile | 2 +- app/lib/version.rb | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index ffe3b55..9f15709 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ARG RUBY_VERSION=3.4.9 -ARG ALPINE_VERSION=3.22 -ARG BUNDLER_VERSION=2.7.2 +ARG ALPINE_VERSION=3.23 +ARG BUNDLER_VERSION=4.0.11 # Defines base image which builder and final stage use FROM ruby:$RUBY_VERSION-alpine$ALPINE_VERSION AS base diff --git a/Makefile b/Makefile index f84253d..121952e 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ .PHONY: all auth help image name publish tag vars version -ALPINE_VERSION?=3.22 +ALPINE_VERSION?=3.23 BUNDLER_VERSION?=$(shell tail -1 Gemfile.lock | tr -d ' ') RUBY_VERSION?=$(shell cat .ruby-version) diff --git a/app/lib/version.rb b/app/lib/version.rb index db186a3..ff701fb 100644 --- a/app/lib/version.rb +++ b/app/lib/version.rb @@ -3,7 +3,7 @@ module Version MAJOR = 2 MINOR = 3 - PATCH = 1 - SUFFIX = nil + PATCH = 2 + SUFFIX = "prerelease" VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}#{SUFFIX && ".#{SUFFIX}"}".freeze end