Merge pull request #4070 from nhsuk/next

Version 2.11.0

Author: thomasleese

.github/workflows/lint.yml

@@ -21,11 +21,8 @@ jobs:
           cache: yarn
           node-version-file: .tool-versions
       - run: yarn install --immutable --immutable-cache --check-cache
-      - uses: hashicorp/setup-terraform@v3
-      - uses: terraform-linters/setup-tflint@v4
-      - run: tflint --chdir=terraform --init
       - uses: jdx/mise-action@v2
         with:
-          version: v2025.7.12
-          install_args: hk pkl
+          install_args: hk pkl tflint terraform
+      - run: tflint --chdir=terraform --init
       - run: hk check --all

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/citizensadvice/capybara_accessible_selectors
-  revision: b60eebb9673b20dd472afb3d724340a6f6132bcb
+  revision: eb1277097bf94cab378182db201985161ca2b7f0
   branch: main
   specs:
     capybara_accessible_selectors (0.11.0)
@@ -113,34 +113,34 @@ GEM
     ast (2.4.3)
     attr_required (1.0.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1130.0)
-    aws-sdk-accessanalyzer (1.73.0)
-      aws-sdk-core (~> 3, >= 3.225.0)
+    aws-partitions (1.1134.0)
+    aws-sdk-accessanalyzer (1.74.0)
+      aws-sdk-core (~> 3, >= 3.227.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-core (3.226.3)
+    aws-sdk-core (3.227.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-ec2 (1.539.0)
-      aws-sdk-core (~> 3, >= 3.225.0)
+    aws-sdk-ec2 (1.541.0)
+      aws-sdk-core (~> 3, >= 3.227.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-ecr (1.104.0)
-      aws-sdk-core (~> 3, >= 3.225.0)
+    aws-sdk-ecr (1.106.0)
+      aws-sdk-core (~> 3, >= 3.227.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-iam (1.124.0)
-      aws-sdk-core (~> 3, >= 3.225.0)
+    aws-sdk-iam (1.125.0)
+      aws-sdk-core (~> 3, >= 3.227.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-kms (1.106.0)
-      aws-sdk-core (~> 3, >= 3.225.0)
+    aws-sdk-kms (1.107.0)
+      aws-sdk-core (~> 3, >= 3.227.0)
       aws-sigv4 (~> 1.5)
     aws-sdk-rds (1.283.0)
       aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.193.0)
-      aws-sdk-core (~> 3, >= 3.225.0)
+    aws-sdk-s3 (1.194.0)
+      aws-sdk-core (~> 3, >= 3.227.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
@@ -156,7 +156,7 @@ GEM
     bindex (0.8.1)
     bootsnap (1.18.6)
       msgpack (~> 1.2)
-    brakeman (7.0.2)
+    brakeman (7.1.0)
       racc
     builder (3.3.0)
     capybara (3.40.0)
@@ -231,7 +231,7 @@ GEM
       railties (>= 6.1.0)
     faker (3.5.2)
       i18n (>= 1.8.11, < 2)
-    faraday (2.13.2)
+    faraday (2.13.3)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -316,7 +316,7 @@ GEM
     jmespath (1.6.2)
     jsbundling-rails (1.3.1)
       railties (>= 6.0.0)
-    json (2.12.2)
+    json (2.13.0)
     json-jwt (1.16.6)
       activesupport (>= 4.2)
       aes_key_wrap
@@ -390,9 +390,9 @@ GEM
       net-protocol
     nio4r (2.7.4)
     nkf (0.2.0)
-    nokogiri (1.18.8-arm64-darwin)
+    nokogiri (1.18.9-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-linux-gnu)
+    nokogiri (1.18.9-x86_64-linux-gnu)
       racc (~> 1.4)
     notifications-ruby-client (6.2.0)
       jwt (>= 1.5, < 3)
@@ -435,7 +435,7 @@ GEM
     prettier_print (1.2.1)
     prettyprint (0.2.0)
     prism (1.4.0)
-    propshaft (1.2.0)
+    propshaft (1.2.1)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
       rack
@@ -562,15 +562,15 @@ GEM
       rubocop-ast (>= 1.45.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.45.1)
+    rubocop-ast (1.46.0)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-capybara (2.22.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-govuk (5.1.17)
+    rubocop-govuk (5.1.18)
       rubocop (= 1.78.0)
-      rubocop-ast (= 1.45.1)
+      rubocop-ast (= 1.46.0)
       rubocop-capybara (= 2.22.1)
       rubocop-rails (= 2.32.0)
       rubocop-rake (= 0.7.1)
@@ -661,7 +661,7 @@ GEM
       rbs
       syntax_tree (>= 2.0.1)
     temple (0.10.0)
-    thor (1.3.2)
+    thor (1.4.0)
     thruster (0.1.14-arm64-darwin)
     thruster (0.1.14-x86_64-linux)
     tilt (2.6.0)

README.md

@@ -339,7 +339,6 @@ See the [releasing documentation](docs/releasing.md) for more information.
 
 - `access_log:for_patient[id]`
 - `access_log:for_user[id]`
-- `clinics:create[name,address,town,postcode,ods_code,organisation_ods_code]`
 - `teams:create[ods_code,name,email,phone]`
 - `users:create[email,password,given_name,family_name,organisation_ods_code]`
 - `vaccines:seed[type]`