v8.3.0

.github/workflows/build-and-push-database-image.yml

@@ -32,7 +32,7 @@ jobs:
         with:
           ref: ${{ inputs.github_ref || github.ref_name == 'next' && 'next' || github.ref_name }}
           repository: nhsdigital/manage-vaccinations-in-schools
-      - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version-file: .tool-versions
           cache: yarn
@@ -57,7 +57,7 @@ jobs:
               echo "Waiting for postgres..."
               sleep 2
             done'
-      - uses: ruby/setup-ruby@60ecfba8750476ff216b59eee3b88218bb5111cc # v1.303.0
+      - uses: ruby/setup-ruby@0cb964fd540e0a24c900370abf38a33466142735 # v1.305.0
         with:
           bundler-cache: true
       - name: Set up database for testing
@@ -72,7 +72,7 @@ jobs:
           aws-region: eu-west-2
       - name: Login to ECR
         id: login-ecr
-        uses: aws-actions/amazon-ecr-login@376925c9d111252e87ae59691e5a442dd100ef6a # v2.1.3
+        uses: aws-actions/amazon-ecr-login@19d944daaa35f0fa1d3f7f8af1d3f2e5de25c5b7 # v2.1.4
       # yamllint disable rule:line-length
       - name: Get image tag
         id: get-image-tag

.github/workflows/build-and-push-image.yml

@@ -114,7 +114,7 @@ jobs:
           aws-region: eu-west-2
       - name: Login to ECR
         id: login-ecr
-        uses: aws-actions/amazon-ecr-login@376925c9d111252e87ae59691e5a442dd100ef6a # v2.1.3
+        uses: aws-actions/amazon-ecr-login@19d944daaa35f0fa1d3f7f8af1d3f2e5de25c5b7 # v2.1.4
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
         # yamllint disable rule:line-length

.github/workflows/deploy-documentation.yml

@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - uses: ruby/setup-ruby@60ecfba8750476ff216b59eee3b88218bb5111cc # v1.303.0
+      - uses: ruby/setup-ruby@0cb964fd540e0a24c900370abf38a33466142735 # v1.305.0
         with:
           bundler-cache: true
 

.github/workflows/end-to-end-tests-aws.yml

@@ -70,7 +70,7 @@ jobs:
           aws-region: eu-west-2
       - name: Login to ECR
         id: login-ecr
-        uses: aws-actions/amazon-ecr-login@376925c9d111252e87ae59691e5a442dd100ef6a # v2.1.3
+        uses: aws-actions/amazon-ecr-login@19d944daaa35f0fa1d3f7f8af1d3f2e5de25c5b7 # v2.1.4
       - name: Build and push mavis/development docker image
         # yamllint disable rule:line-length
         run: |

.github/workflows/end-to-end-tests-local.yml

@@ -26,12 +26,12 @@ jobs:
         with:
           ref: ${{ github.base_ref }}
       - name: Setup Node.js on base branch
-        uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version-file: .tool-versions
           cache: yarn
       - name: Setup Ruby on base branch
-        uses: ruby/setup-ruby@60ecfba8750476ff216b59eee3b88218bb5111cc # v1.303.0
+        uses: ruby/setup-ruby@0cb964fd540e0a24c900370abf38a33466142735 # v1.305.0
         with:
           bundler-cache: true
       - name: Install JS dependencies on base branch
@@ -43,12 +43,12 @@ jobs:
         with:
           ref: ${{ github.head_ref }}
       - name: Setup Node.js on head branch
-        uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version-file: .tool-versions
           cache: yarn
       - name: Setup Ruby on head branch
-        uses: ruby/setup-ruby@60ecfba8750476ff216b59eee3b88218bb5111cc # v1.303.0
+        uses: ruby/setup-ruby@0cb964fd540e0a24c900370abf38a33466142735 # v1.305.0
         with:
           bundler-cache: true
       - name: Install JS dependencies on head branch

.github/workflows/lint.yml

@@ -13,10 +13,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - uses: ruby/setup-ruby@60ecfba8750476ff216b59eee3b88218bb5111cc # v1.303.0
+      - uses: ruby/setup-ruby@0cb964fd540e0a24c900370abf38a33466142735 # v1.305.0
         with:
           bundler-cache: true
-      - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           cache: yarn
           node-version-file: .tool-versions

.github/workflows/test.yml

@@ -26,11 +26,11 @@ jobs:
       DATABASE_PASSWORD: postgres
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version-file: .tool-versions
           cache: yarn
-      - uses: ruby/setup-ruby@60ecfba8750476ff216b59eee3b88218bb5111cc # v1.303.0
+      - uses: ruby/setup-ruby@0cb964fd540e0a24c900370abf38a33466142735 # v1.305.0
         with:
           bundler-cache: true
       - name: Precompile assets
@@ -64,11 +64,11 @@ jobs:
         postgis://postgres:postgres@localhost:5432/manage_vaccinations_development
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version-file: .tool-versions
           cache: yarn
-      - uses: ruby/setup-ruby@60ecfba8750476ff216b59eee3b88218bb5111cc # v1.303.0
+      - uses: ruby/setup-ruby@0cb964fd540e0a24c900370abf38a33466142735 # v1.305.0
         with:
           bundler-cache: true
       - name: Run seeds
@@ -79,7 +79,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version-file: .tool-versions
           cache: yarn

.rubocop.yml

@@ -66,12 +66,6 @@ RSpec/ContextWording:
 RSpec/ImplicitExpect:
   EnforcedStyle: should
 
-RSpec/VerifiedDoubles:
-  Exclude:
-    - spec/controllers/concerns/consent_form_mailer_concern_spec.rb
-    - spec/controllers/concerns/triage_mailer_concern_spec.rb
-    - spec/controllers/concerns/vaccination_mailer_concern_spec.rb
-
 Style/FrozenStringLiteralComment:
   Enabled: true
   EnforcedStyle: always_true

Gemfile.lock

@@ -178,7 +178,7 @@ GEM
       protocol-websocket (~> 0.17)
     attr_required (1.0.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1240.0)
+    aws-partitions (1.1242.0)
     aws-sdk-accessanalyzer (1.88.0)
       aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
@@ -193,7 +193,7 @@ GEM
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-ec2 (1.611.0)
+    aws-sdk-ec2 (1.613.0)
       aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
     aws-sdk-ecr (1.125.0)
@@ -202,13 +202,13 @@ GEM
     aws-sdk-iam (1.142.0)
       aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-kms (1.123.0)
+    aws-sdk-kms (1.124.0)
       aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
     aws-sdk-rds (1.311.0)
       aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.219.0)
+    aws-sdk-s3 (1.220.0)
       aws-sdk-core (~> 3, >= 3.244.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)

app/components/app_import_summary_component.html.erb

@@ -68,7 +68,7 @@
         import.parent_relationships.present? %>
     <% if import.removing_parent_relationships? %>
       <p class="nhsuk-u-secondary-text-colour">Parent-child relationships are currently being removed from this import</p>
-    <% elsif import.processed? && import.parent_relationships.any? %>
+    <% elsif import.processed_at? && import.parent_relationships.any? %>
       <p>
         <%= link_to "Remove all parent-child relationships from import", imports_bulk_remove_parents_path(import.class.name.underscore, import.id) %>
       </p>

app/controllers/api/testing/reporting_refresh_controller.rb → app/controllers/api/testing/refresh_reporting_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class API::Testing::ReportingRefreshController < API::Testing::BaseController
+class API::Testing::RefreshReportingController < API::Testing::BaseController
   def create
     if params[:wait].present?
       ReportingAPI::RefreshJob.perform_now