Merge branch 'develop' into origin/feature/nrmi-11-banner-usability-enhancements-admin-messages-to-end-based-on-set-stop-datetime

Author: reemi1510

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Change Log
 
+## [release-176] - 2026-03-31
+
+- NRMI-258: GCA header and footer updates
+- NRMI-294: fix contrast issue on mobile
+- NRMI-319: fix sidekiq issue
+
+## [release-175] - 2026-03-23
+
+- NRMI-278: address outdated container package
+- NRMI-39: self-service update user name 
+- NRMI-253: address accessibility issues agreement page
+- NRMI-252: add helpful messaging when archiving fails
+- [Snyk] Upgrade codemirror from 6.0.0 to 6.0.2 
+- [Snyk] Security upgrade aws-sdk-s3 from 1.112.0 to 1.208.0 
+
 ## [release-174] - 2026-02-02
 
 - NRMI-257: address deadlock error 
@@ -1155,6 +1170,8 @@ this should have been released in release 45 but wasn't actually merged
 
 Initial release
 
+[release-176]: https://github.com/Crown-Commercial-Service/DataSubmissionServiceAPI/compare/release-175...release-176
+[release-175]: https://github.com/Crown-Commercial-Service/DataSubmissionServiceAPI/compare/release-174...release-175
 [release-174]: https://github.com/Crown-Commercial-Service/DataSubmissionServiceAPI/compare/release-173...release-174
 [release-173]: https://github.com/Crown-Commercial-Service/DataSubmissionServiceAPI/compare/release-172...release-173
 [release-172]: https://github.com/Crown-Commercial-Service/DataSubmissionServiceAPI/compare/release-171...release-172

Gemfile

@@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby '3.4.8'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 8.0', '>= 8.0.4'
+gem 'rails', '~> 8.1', '>= 8.1.2.1'
 
 # State machine
 gem 'aasm'
@@ -44,7 +44,7 @@ gem 'redcarpet', '~> 3.6'
 gem 'auth0', '~> 5.1', '>= 5.1.2', require: false
 
 # Google Login
-gem 'omniauth-google-oauth2', '>= 1.2.0'
+gem 'omniauth-google-oauth2', '>= 1.2.2'
 gem 'omniauth-rails_csrf_protection', '~> 2.0', '>= 2.0.0'
 
 # Admin Frontend
@@ -104,13 +104,15 @@ gem 'net-http', '>= 0.4.0'
 
 gem 'sprockets-rails', '>= 3.5.1'
 
+gem 'connection_pool', '< 3'
+
 group :development, :test do
   gem 'brakeman', require: false
   gem 'byebug', platforms: %i[mri mingw x64_mingw]
   gem 'dotenv-rails', '>= 3.2.0'
   gem 'factory_bot_rails', '~> 6.5', '>= 6.5.1'
   gem 'pry-rails'
-  gem 'rspec-rails', '~> 8.0', '>= 8.0.0'
+  gem 'rspec-rails', '~> 8.0', '>= 8.0.4'
 end
 
 group :development do
@@ -129,7 +131,7 @@ group :test do
   gem 'jsonapi-rspec', require: false
   gem 'ruby_event_store-rspec'
   gem 'rspec-json_expectations'
-  gem 'shoulda-matchers', '~> 6.0', '>= 6.0.0'
+  gem 'shoulda-matchers', '~> 7.0', '>= 7.0.1'
   gem 'capybara', '~> 3.40', '>= 3.40.0'
   gem 'climate_control'
   gem 'webmock', '>= 3.24.0'