Merge branch 'develop' into snyk-fix-a6f76ec7ea34e302b21d628858eb59bf

Author: reemi1510

.rubocop.yml

@@ -122,6 +122,7 @@ Metrics/AbcSize:
         - 'app/controllers/admin/suppliers_controller.rb'
         - 'app/controllers/v1/tasks_controller.rb'
         - 'app/controllers/admin/users_controller.rb'
+        - 'app/jobs/cleanup_submission_entries_job.rb'
 
 Layout/LineLength:
     Max: 120

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## [release-171] - 2025-10-23
+
+- NRMI-178: Clean up non-active validation_failed entries job
+
+## [release-170] - 2025-10-13
+
+- NRMI-143: fix unpermitted aria attribute accessibility error
+- NRMI-152: QA observation of inconsistent banner colours
+- NRMI-172: set up github actions
+- NRMI-166: Add archived agreement status
+- NRMI-177: Delete validation failed submission entries when resolved
+
 ## [release-169] - 2025-08-18
 
 - NRMI-153: fix for overflowing supplier page table
@@ -1121,6 +1133,8 @@ this should have been released in release 45 but wasn't actually merged
 
 Initial release
 
+[release-171]: https://github.com/Crown-Commercial-Service/DataSubmissionServiceAPI/compare/release-170...release-171
+[release-170]: https://github.com/Crown-Commercial-Service/DataSubmissionServiceAPI/compare/release-169...release-170
 [release-169]: https://github.com/Crown-Commercial-Service/DataSubmissionServiceAPI/compare/release-168...release-169
 [release-168]: https://github.com/Crown-Commercial-Service/DataSubmissionServiceAPI/compare/release-167...release-168
 [release-167]: https://github.com/Crown-Commercial-Service/DataSubmissionServiceAPI/compare/release-166...release-167

Gemfile

@@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby '3.4.2'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 8.0', '>= 8.0.0'
+gem 'rails', '~> 8.0', '>= 8.0.2.1'
 
 # State machine
 gem 'aasm'
@@ -17,7 +17,7 @@ gem 'email_validator', require: 'email_validator/strict'
 
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 # gem 'jbuilder', '~> 2.7', '>= 2.7.0'
-gem 'jbuilder', '~> 2.12', '>= 2.12.0'
+gem 'jbuilder', '~> 2.13', '>= 2.13.0'
 
 # JSON API
 gem 'jsonapi-rails'
@@ -44,11 +44,11 @@ gem 'redcarpet', '~> 3.6'
 gem 'auth0', '~> 5.1', '>= 5.1.2', require: false
 
 # Google Login
-gem 'omniauth-google-oauth2', '>= 1.1.2'
+gem 'omniauth-google-oauth2', '>= 1.2.0'
 gem 'omniauth-rails_csrf_protection', '~> 1.0', '>= 1.0.2'
 
 # Admin Frontend
-gem 'haml-rails', '>= 2.1.0'
+gem 'haml-rails', '>= 3.0.0'
 gem 'sass-rails', '~> 6.0', '>= 6.0.0'
 gem 'uglifier', '~> 4.2'
 gem 'kaminari', '>= 1.2.2'
@@ -66,18 +66,18 @@ gem 'lograge', '>= 0.14.0'
 # gem 'skylight', '~> 6.0', '>= 6.0.0'
 
 gem 'rubocop', '>= 1.66.0'
-gem 'rubocop-rails', '~> 2.30', '>= 2.30.2'
+gem 'rubocop-rails', '~> 2.31', '>= 2.31.0'
 
 gem 'progress_bar', require: false
 
 gem 'sidekiq-pro', source: 'https://gems.contribsys.com/'
 # gem 'sidekiq', '>=5.2.10' # Free version, use for local image building
-gem 'sidekiq-cron', '>= 2.1.0'
+gem 'sidekiq-cron', '>= 2.3.1'
 
 # Alpine and Windows do not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby ruby]
 
-gem 'activerecord-import', '>= 1.5.0'
+gem 'activerecord-import', '>= 1.5.1'
 
 gem 'parslet'
 
@@ -107,9 +107,9 @@ group :development, :test do
   gem 'brakeman', require: false
   gem 'byebug', platforms: %i[mri mingw x64_mingw]
   gem 'dotenv-rails', '>= 3.1.3'
-  gem 'factory_bot_rails', '~> 6.4', '>= 6.4.4'
+  gem 'factory_bot_rails', '~> 6.5', '>= 6.5.1'
   gem 'pry-rails'
-  gem 'rspec-rails', '~> 6.1', '>= 6.1.3'
+  gem 'rspec-rails', '~> 7.0', '>= 7.0.0'
 end
 
 group :development do
@@ -128,7 +128,7 @@ group :test do
   gem 'jsonapi-rspec', require: false
   gem 'ruby_event_store-rspec'
   gem 'rspec-json_expectations'
-  gem 'shoulda-matchers', '~> 5.1', '>= 5.1.0'
+  gem 'shoulda-matchers', '~> 6.0', '>= 6.0.0'
   gem 'capybara', '~> 3.40', '>= 3.40.0'
   gem 'climate_control'
   gem 'webmock', '>= 3.24.0'