Update to rails 7.2.2

unboxed · Nov 6, 2024 · 2442900 · 2442900
1 parent 254d32a
commit 2442900
Show file tree

Hide file tree

Showing 6 changed files with 104 additions and 90 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -2,6 +2,7 @@
 
 # Ignore git directory.
 /.git/
+/.gitignore
 
 # Ignore bundler config.
 /.bundle
@@ -10,6 +11,12 @@
 /.env*
 !/.env*.erb
 
+# Ignore CI service files.
+/.github
+
+# Ignore development files
+/.devcontainer
+
 # Ignore all default key files.
 /config/master.key
 /config/credentials/*.key
@@ -36,11 +43,14 @@
 !/app/assets/builds/.keep
 /public/assets
 
-/.dockerignore
-/Dockerfile.production
-/docker/*/Dockerfile
-docker-compose.yml
 /bops-applicants
 /deploy
 /pkg
 /.cache
+
+# Ignore Docker-related files
+/.dockerignore
+/Dockerfile*
+/Dockerfile.production
+/docker/*/Dockerfile
+docker-compose.yml
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,16 +1,21 @@
 version: 2
 updates:
-  - package-ecosystem: "bundler"
+  - package-ecosystem: bundler
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: daily
     open-pull-requests-limit: 0 # security only
-  - package-ecosystem: "docker"
+  - package-ecosystem: docker
     directory: "/"
     schedule:
-      interval: "daily"
-  - package-ecosystem: "npm"
+      interval: daily
+  - package-ecosystem: github-actions
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: daily
+    open-pull-requests-limit: 10
+  - package-ecosystem: npm
+    directory: "/"
+    schedule:
+      interval: daily
     open-pull-requests-limit: 0 # security only
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,8 @@
 # See https://help.github.com/articles/ignoring-files for more about ignoring files.
 #
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile '~/.gitignore_global'
+# Temporary files generated by your text editor or operating system
+# belong in git's global ignore instead:
+# `$XDG_CONFIG_HOME/git/ignore` or `~/.config/git/ignore`
 
 # Ignore bundler config.
 /.bundle

diff --git a/Gemfile b/Gemfile
@@ -35,7 +35,7 @@ gem "pagy"
 gem "pg", ">= 0.18", "< 2.0"
 gem "puma", "~> 6"
 gem "rack", "~> 3"
-gem "rails", "~> 7.1"
+gem "rails", "~> 7.2"
 gem "rails_autolink"
 gem "rgeo"
 gem "rgeo-geojson"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -26,7 +26,7 @@ PATH
       govuk-components (~> 5, >= 5.3.2)
       govuk_design_system_formbuilder (~> 5, >= 5.3.2)
       pagy
-      rails (>= 7.1.3, < 7.2)
+      rails (~> 7.2)
 
 PATH
   remote: engines/bops_uploads
@@ -39,83 +39,80 @@ GEM
   specs:
     aasm (5.2.0)
       concurrent-ruby (~> 1.0)
-    actioncable (7.1.4.1)
-      actionpack (= 7.1.4.1)
-      activesupport (= 7.1.4.1)
+    actioncable (7.2.2)
+      actionpack (= 7.2.2)
+      activesupport (= 7.2.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.4.1)
-      actionpack (= 7.1.4.1)
-      activejob (= 7.1.4.1)
-      activerecord (= 7.1.4.1)
-      activestorage (= 7.1.4.1)
-      activesupport (= 7.1.4.1)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.1.4.1)
-      actionpack (= 7.1.4.1)
-      actionview (= 7.1.4.1)
-      activejob (= 7.1.4.1)
-      activesupport (= 7.1.4.1)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
+    actionmailbox (7.2.2)
+      actionpack (= 7.2.2)
+      activejob (= 7.2.2)
+      activerecord (= 7.2.2)
+      activestorage (= 7.2.2)
+      activesupport (= 7.2.2)
+      mail (>= 2.8.0)
+    actionmailer (7.2.2)
+      actionpack (= 7.2.2)
+      actionview (= 7.2.2)
+      activejob (= 7.2.2)
+      activesupport (= 7.2.2)
+      mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.4.1)
-      actionview (= 7.1.4.1)
-      activesupport (= 7.1.4.1)
+    actionpack (7.2.2)
+      actionview (= 7.2.2)
+      activesupport (= 7.2.2)
       nokogiri (>= 1.8.5)
       racc
-      rack (>= 2.2.4)
+      rack (>= 2.2.4, < 3.2)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.4.1)
-      actionpack (= 7.1.4.1)
-      activerecord (= 7.1.4.1)
-      activestorage (= 7.1.4.1)
-      activesupport (= 7.1.4.1)
+      useragent (~> 0.16)
+    actiontext (7.2.2)
+      actionpack (= 7.2.2)
+      activerecord (= 7.2.2)
+      activestorage (= 7.2.2)
+      activesupport (= 7.2.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.4.1)
-      activesupport (= 7.1.4.1)
+    actionview (7.2.2)
+      activesupport (= 7.2.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.1.4.1)
-      activesupport (= 7.1.4.1)
+    activejob (7.2.2)
+      activesupport (= 7.2.2)
       globalid (>= 0.3.6)
-    activemodel (7.1.4.1)
-      activesupport (= 7.1.4.1)
-    activerecord (7.1.4.1)
-      activemodel (= 7.1.4.1)
-      activesupport (= 7.1.4.1)
+    activemodel (7.2.2)
+      activesupport (= 7.2.2)
+    activerecord (7.2.2)
+      activemodel (= 7.2.2)
+      activesupport (= 7.2.2)
       timeout (>= 0.4.0)
-    activerecord-postgis-adapter (9.0.1)
-      activerecord (~> 7.1.0)
-      rgeo-activerecord (~> 7.0.0)
-    activestorage (7.1.4.1)
-      actionpack (= 7.1.4.1)
-      activejob (= 7.1.4.1)
-      activerecord (= 7.1.4.1)
-      activesupport (= 7.1.4.1)
+    activerecord-postgis-adapter (10.0.0)
+      activerecord (~> 7.2.0)
+      rgeo-activerecord (~> 8.0.0)
+    activestorage (7.2.2)
+      actionpack (= 7.2.2)
+      activejob (= 7.2.2)
+      activerecord (= 7.2.2)
+      activesupport (= 7.2.2)
       marcel (~> 1.0)
-    activesupport (7.1.4.1)
+    activesupport (7.2.2)
       base64
+      benchmark (>= 0.3)
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     acts_as_list (1.1.0)
       activerecord (>= 4.2)
     addressable (2.8.6)
@@ -142,6 +139,7 @@ GEM
       aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.2.0)
     bcrypt (3.1.20)
+    benchmark (0.3.0)
     better_html (2.0.1)
       actionview (>= 6.0)
       activesupport (>= 6.0)
@@ -392,7 +390,6 @@ GEM
     minitest (5.25.1)
     msgpack (1.7.2)
     multi_test (0.1.2)
-    mutex_m (0.2.0)
     nenv (0.3.0)
     net-http (0.4.1)
       uri
@@ -451,20 +448,20 @@ GEM
     rackup (2.1.0)
       rack (>= 3)
       webrick (~> 1.8)
-    rails (7.1.4.1)
-      actioncable (= 7.1.4.1)
-      actionmailbox (= 7.1.4.1)
-      actionmailer (= 7.1.4.1)
-      actionpack (= 7.1.4.1)
-      actiontext (= 7.1.4.1)
-      actionview (= 7.1.4.1)
-      activejob (= 7.1.4.1)
-      activemodel (= 7.1.4.1)
-      activerecord (= 7.1.4.1)
-      activestorage (= 7.1.4.1)
-      activesupport (= 7.1.4.1)
+    rails (7.2.2)
+      actioncable (= 7.2.2)
+      actionmailbox (= 7.2.2)
+      actionmailer (= 7.2.2)
+      actionpack (= 7.2.2)
+      actiontext (= 7.2.2)
+      actionview (= 7.2.2)
+      activejob (= 7.2.2)
+      activemodel (= 7.2.2)
+      activerecord (= 7.2.2)
+      activestorage (= 7.2.2)
+      activesupport (= 7.2.2)
       bundler (>= 1.15.0)
-      railties (= 7.1.4.1)
+      railties (= 7.2.2)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -481,10 +478,10 @@ GEM
       railties (>= 6.0.0, < 8)
     rails_autolink (1.1.7)
       rails (> 3.1)
-    railties (7.1.4.1)
-      actionpack (= 7.1.4.1)
-      activesupport (= 7.1.4.1)
-      irb
+    railties (7.2.2)
+      actionpack (= 7.2.2)
+      activesupport (= 7.2.2)
+      irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
@@ -508,9 +505,9 @@ GEM
       railties (>= 5.2)
     rexml (3.3.9)
     rgeo (3.0.0)
-    rgeo-activerecord (7.0.1)
-      activerecord (>= 5.0)
-      rgeo (>= 1.0.0)
+    rgeo-activerecord (8.0.0)
+      activerecord (>= 7.0)
+      rgeo (>= 3.0)
     rgeo-geojson (2.1.1)
       rgeo (>= 1.0.0)
     rotp (6.3.0)
@@ -574,6 +571,7 @@ GEM
     rubyzip (2.3.2)
     rufus-scheduler (3.8.2)
       fugit (~> 1.1, >= 1.1.6)
+    securerandom (0.3.1)
     selenium-webdriver (4.16.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
@@ -632,6 +630,7 @@ GEM
     unicode-display_width (2.5.0)
     uniform_notifier (1.16.0)
     uri (0.13.0)
+    useragent (0.16.10)
     view_component (3.11.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
@@ -717,7 +716,7 @@ DEPENDENCIES
   pry-byebug
   puma (~> 6)
   rack (~> 3)
-  rails (~> 7.1)
+  rails (~> 7.2)
   rails-controller-testing
   rails_autolink
   rgeo

diff --git a/engines/bops_core/bops_core.gemspec b/engines/bops_core/bops_core.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
     Dir["{app,config,db,lib}/**/*"]
   end
 
-  spec.add_dependency "rails", ">= 7.1.3", "< 7.2"
+  spec.add_dependency "rails", "~> 7.2"
   spec.add_dependency "govuk-components", "~> 5", ">= 5.3.2"
   spec.add_dependency "govuk_design_system_formbuilder", "~> 5", ">= 5.3.2"
   spec.add_dependency "pagy"