Merge pull request #5125 from nhsuk/next

Version 5.5.0

Author: thomasleese

.prettierrc

@@ -1,3 +1,11 @@
 {
-  "plugins": ["@prettier/plugin-ruby"]
+  "plugins": ["@prettier/plugin-ruby"],
+  "overrides": [
+    {
+      "files": ["*.rb", "*.md"],
+      "options": {
+        "trailingComma": "none"
+      }
+    }
+  ]
 }

.rubocop.yml

@@ -81,3 +81,6 @@ Style/NumericLiterals:
 Rails/ApplicationController:
   Exclude:
     - app/controllers/errors_controller.rb
+
+Naming/ClassAndModuleCamelCase:
+  AllowedNames: [ActiveRecord_Relation]

Dockerfile

@@ -59,6 +59,7 @@ RUN bundle exec bootsnap precompile app/ lib/
 RUN SECRET_KEY_BASE_DUMMY=1 \
     MAVIS__CIS2__ENABLED=false \
     MAVIS__SPLUNK__ENABLED=false \
+    REDIS_CACHE_URL=1 \
     ./bin/rails assets:precompile
 
 # Remove node modules to reduce image size

Gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 ruby file: ".ruby-version"
-gem "rails", "~> 8.0.3"
+gem "rails", "8.1.1"
 
 # Framework gems
 gem "bootsnap", require: false
@@ -52,9 +52,11 @@ gem "omniauth_openid_connect"
 gem "omniauth-rails_csrf_protection"
 gem "pagy"
 gem "phonelib"
+gem "pstore"
 gem "pundit"
 gem "rails_semantic_logger"
 gem "rainbow"
+gem "redis"
 gem "ruby-progressbar"
 gem "rubyzip"
 gem "scenic"
@@ -66,14 +68,14 @@ gem "sidekiq-scheduler"
 gem "sidekiq-throttled"
 gem "splunk-sdk-ruby"
 gem "table_tennis"
-gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby]
+gem "tzinfo-data", platforms: %i[jruby windows]
 gem "uk_postcode"
 gem "wicked"
 gem "with_advisory_lock"
 
 group :development, :test do
   gem "brakeman", require: false
-  gem "debug", platforms: %i[mri mingw x64_mingw]
+  gem "debug", platforms: %i[mri windows]
   gem "factory_bot_instruments"
   gem "pry-rails"
   gem "rspec-rails"