Merge pull request #654 from Crown-Commercial-Service/merge-preproduc…

…tion-into-production

Merge preproduction into main

.rubocop.yml

@@ -213,7 +213,7 @@ Style/HashTransformValues: # (new in 0.80)
 Style/KeywordParametersOrder: # (new in 0.90)
   Enabled: true
 Style/OptionalBooleanParameter: # (new in 0.89)
-  Enabled: true
+  Enabled: false
 Style/RedundantAssignment: # (new in 0.87)
   Enabled: true
 Style/RedundantFetchBlock: # (new in 0.86)

Gemfile

@@ -4,11 +4,11 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby '3.2.2'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 7.0.5'
+gem 'rails', '~> 7.0.8'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3', '~> 1.4'
 # Use Puma as the app server
-gem 'puma', '~> 4.3', '>= 4.3.12'
+gem 'puma', '~> 5.6', '>= 5.6.7'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 # gem 'jbuilder', '~> 2.7'
 # Use Redis adapter to run Action Cable in production
@@ -59,7 +59,7 @@ group :development, :test do
   gem 'rspec-rails', '>= 5.1.2'
   gem 'rubocop', '>= 1.12.0'
   gem 'rubocop-performance', '>= 1.10.2'
-  gem 'rubocop-rails', '>= 2.14.2'
+  gem 'rubocop-rails', '>= 2.21.0'
   gem 'rubocop-rspec', '>= 2.2.0' # or gem 'rubocop-minitest'
   gem 'brakeman'
   gem 'pry-rails'