Merge pull request #625 from alphagov/upgrade-to-rails-8.1.2

[SCH-1782] Upgrade rails gem to 8.1.2

Author: stringiest

Gemfile

@@ -1,12 +1,13 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-RAILS_GEMS_VERSION = "8.0.1".freeze
+RAILS_GEMS_VERSION = "8.1.2".freeze
 gem "actionpack", RAILS_GEMS_VERSION
 gem "activemodel", RAILS_GEMS_VERSION
 gem "activesupport", RAILS_GEMS_VERSION
 gem "railties", RAILS_GEMS_VERSION
 
+gem "benchmark"
 gem "bootsnap", require: false
 gem "connection_pool"
 gem "csv"

Gemfile.lock

@@ -1,32 +1,32 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (8.0.1)
-      actionview (= 8.0.1)
-      activesupport (= 8.0.1)
+    actionpack (8.1.2)
+      actionview (= 8.1.2)
+      activesupport (= 8.1.2)
       nokogiri (>= 1.8.5)
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actionview (8.0.1)
-      activesupport (= 8.0.1)
+    actionview (8.1.2)
+      activesupport (= 8.1.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activemodel (8.0.1)
-      activesupport (= 8.0.1)
-    activesupport (8.0.1)
+    activemodel (8.1.2)
+      activesupport (= 8.1.2)
+    activesupport (8.1.2)
       base64
-      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      json
       logger (>= 1.4.2)
       minitest (>= 5.1)
       securerandom (>= 0.3)
@@ -432,13 +432,14 @@ GEM
     rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       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.0.1)
-      actionpack (= 8.0.1)
-      activesupport (= 8.0.1)
+    railties (8.1.2)
+      actionpack (= 8.1.2)
+      activesupport (= 8.1.2)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
+      tsort (>= 0.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.3.1)
@@ -569,9 +570,10 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  actionpack (= 8.0.1)
-  activemodel (= 8.0.1)
-  activesupport (= 8.0.1)
+  actionpack (= 8.1.2)
+  activemodel (= 8.1.2)
+  activesupport (= 8.1.2)
+  benchmark
   bootsnap
   brakeman
   climate_control
@@ -587,7 +589,7 @@ DEPENDENCIES
   loofah
   prometheus-client
   pry-byebug
-  railties (= 8.0.1)
+  railties (= 8.1.2)
   redis
   redlock
   rspec-rails

bin/rubocop

@@ -2,7 +2,7 @@
 require "rubygems"
 require "bundler/setup"
 
-# explicit rubocop config increases performance slightly while avoiding config confusion.
+# Explicit RuboCop config increases performance slightly while avoiding config confusion.
 ARGV.unshift("--config", File.expand_path("../.rubocop.yml", __dir__))
 
 load Gem.bin_path("rubocop", "rubocop")

config/application.rb

@@ -12,8 +12,26 @@
 
 module SearchApiV2
   class Application < Rails::Application
-    config.load_defaults 8.0
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 8.1
+
+    # Please, add to the `ignore` list any other `lib` subdirectories that do
+    # not contain `.rb` files, or that should not be reloaded or eager loaded.
+    # Common ones are `templates`, `generators`, or `middleware`, for example.
+    config.autoload_lib(ignore: %w[assets tasks])
+
+    # Configuration for the application, engines, and railties goes here.
+    #
+    # These settings can be overridden in specific environments using the files
+    # in config/environments, which are processed later.
+
     config.govuk_time_zone = "London"
+    # config.time_zone = "Central Time (US & Canada)"
+    # config.eager_load_paths << Rails.root.join("extras")
+
+    # Only loads a smaller set of middleware suitable for API only apps.
+    # Middleware like session, flash, cookies can be added back manually.
+    # Skip views, helpers and assets when generating a new resource.
     config.api_only = true
 
     # Google Discovery Engine configuration

config/environments/development.rb

@@ -29,6 +29,9 @@
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
+  # Highlight code that triggered redirect in logs.
+  config.action_dispatch.verbose_redirect_logs = true
+
   # Raises error for missing translations.
   # config.i18n.raise_on_missing_translations = true
 
@@ -41,6 +44,3 @@
   # Apply autocorrection by RuboCop to files generated by `bin/rails generate`.
   config.generators.apply_rubocop_autocorrect_after_generate!
 end
-
-# TODO: remove this workaround once GovukPrometheusExporter initialisation is fixed in govuk_app_config.
-ENV["GOVUK_PROMETHEUS_EXPORTER"] = "force"

config/environments/test.rb

@@ -46,6 +46,3 @@
   config.discovery_engine_default_collection_name = "[collection]"
   config.discovery_engine_default_location_name = "[location]"
 end
-
-# TODO: remove this workaround once GovukPrometheusExporter initialisation is fixed in govuk_app_config.
-ENV["GOVUK_PROMETHEUS_EXPORTER"] = "force"