Merge branch 'main' into EL-1669-cfe-payloads

.github/actions/delete-uat-release/action.yml

@@ -83,7 +83,6 @@ runs:
         if [[ ! -z "$found" ]]
         then
           helm delete $release_name
-          kubectl delete pvc data-$release_name-postgresql-0
           echo "message=\"Deleted UAT release ${release_name}\"" >> $GITHUB_OUTPUT
         else
           echo "message=\"UAT release, ${release_name}, not found\"" >> $GITHUB_OUTPUT

.github/workflows/delete_uat_release.yml

@@ -1,15 +1,12 @@
 name: Delete UAT release
 
 on:
-  pull_request:
+  pull_request_target:
     types:
       - closed
 
 jobs:
   delete_uat_job:
-    # Adding a condition so that the `pull_request` workflow cathes merged PRs, if not caught when the PR closes. Have had some instances when the job runs but the UAT pod still exists.
-    # As per this documentation https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#running-your-pull_request-workflow-when-a-pull-request-merges
-    if: github.event.pull_request.merged == true || github.event.pull_request.merged == false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

Gemfile.lock

@@ -83,11 +83,11 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     annotate_models (1.0.1)
     ast (2.4.2)
-    axe-core-api (4.9.1)
+    axe-core-api (4.10.0)
       dumb_delegator
       virtus
-    axe-core-rspec (4.9.1)
-      axe-core-api (= 4.9.1)
+    axe-core-rspec (4.10.0)
+      axe-core-api (= 4.10.0)
       dumb_delegator
       virtus
     axiom-types (0.1.1)
@@ -183,10 +183,10 @@ GEM
       railties (>= 5.0.0)
     faker (3.4.2)
       i18n (>= 1.8.11, < 2)
-    faraday (2.10.1)
-      faraday-net_http (>= 2.0, < 3.2)
+    faraday (2.11.0)
+      faraday-net_http (>= 2.0, < 3.4)
       logger
-    faraday-net_http (3.1.1)
+    faraday-net_http (3.3.0)
       net-http
     faraday-net_http_persistent (2.1.0)
       faraday (~> 2.5)
@@ -209,7 +209,7 @@ GEM
     govuk_notify_rails (3.0.0)
       notifications-ruby-client (~> 6.2)
       rails (>= 4.1.0)
-    grover (1.1.9)
+    grover (1.1.10)
       combine_pdf (~> 1.0)
       nokogiri (~> 1.0)
     hashdiff (1.1.0)
@@ -246,7 +246,7 @@ GEM
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
     language_server-protocol (3.17.0.3)
-    logger (1.6.0)
+    logger (1.6.1)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -261,7 +261,8 @@ GEM
     mini_mime (1.1.5)
     minitest (5.25.1)
     msgpack (1.7.2)
-    multi_xml (0.6.0)
+    multi_xml (0.7.1)
+      bigdecimal (~> 3.1)
     mutex_m (0.2.0)
     nested_form (0.3.2)
     net-http (0.4.1)
@@ -297,7 +298,7 @@ GEM
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
-    omniauth-google-oauth2 (1.1.2)
+    omniauth-google-oauth2 (1.1.3)
       jwt (>= 2.0)
       oauth2 (~> 2.0)
       omniauth (~> 2.0)
@@ -314,10 +315,10 @@ GEM
     openssl (3.2.0)
     orm_adapter (0.5.0)
     pagy (9.0.5)
-    parallel (1.25.1)
+    parallel (1.26.3)
     parallel_tests (4.7.1)
       parallel
-    parser (3.3.4.0)
+    parser (3.3.4.2)
       ast (~> 2.4.1)
       racc
     pdf-forms (1.5.1)
@@ -423,7 +424,7 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.3.5)
+    rexml (3.3.6)
       strscan
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
@@ -489,7 +490,7 @@ GEM
       rexml
     rubyzip (2.3.2)
     safe_shell (1.1.0)
-    selenium-webdriver (4.23.0)
+    selenium-webdriver (4.24.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
@@ -514,7 +515,7 @@ GEM
       actionpack (>= 3.1)
       railties (>= 3.1)
       slim (>= 3.0, < 6.0, != 5.0.0)
-    slim_lint (0.27.0)
+    slim_lint (0.28.0)
       rubocop (>= 1.0, < 2.0)
       slim (>= 3.0, < 6.0)
     smart_properties (1.17.0)
@@ -526,7 +527,7 @@ GEM
     temple (0.10.3)
     thor (1.3.1)
     thread_safe (0.3.6)
-    tilt (2.3.0)
+    tilt (2.4.0)
     timeout (0.4.1)
     turbo-rails (1.5.0)
       actionpack (>= 6.0.0)
@@ -535,7 +536,7 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
-    uri (0.13.0)
+    uri (0.13.1)
     vcr (6.3.1)
       base64
     version_gem (1.1.4)

app/views/question_flow/_additional_property_section.html.slim

@@ -59,7 +59,7 @@
             field_name: "percentage_owned",
             counter:,
             label: t("question_flow.#{i18n_key}.percentage_owned.input"),
-            hint: (t("question_flow.additional_property_details.percentage_owned.hint") if @check.partner && !partner),
+            hint: t("question_flow.#{i18n_key}.percentage_owned.hint"),
             value: model.percentage_owned,
             label_size: "m"
 

config/locales/en.yml

@@ -1594,6 +1594,7 @@ en:
         input_hint: Check the statement from the mortgage provider or lender and include any other loans secured against the property
       percentage_owned:
         input: What percentage share does the partner own?
+        hint: ""
     vehicles_details:
       heading: Tell us about the vehicle
       vehicle: Vehicle

package.json

@@ -3,7 +3,7 @@
   "private": "true",
   "dependencies": {
     "@ministryofjustice/frontend": "^2.2.0",
-    "@rails/ujs": "^7.1.3",
+    "@rails/ujs": "^7.1.400",
     "@sentry/browser": "8.26.0",
     "esbuild": "^0.23.1",
     "govuk-frontend": "^5.5.0",

yarn.lock

@@ -205,10 +205,10 @@
   resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.1.7.tgz#b09dc5b2105dd267e8374c47e4490240451dc7f6"
   integrity sha512-0e7WQ4LE/+LEfW2zfAw9ppsB6A8RmxbdAUPAF++UT80epY+7emuQDkKXmaK0a9lp6An50RvzezI0cIQjp1A58w==
 
-"@rails/ujs@^7.1.3":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-7.1.3.tgz#6d94a68b7da5046147d31716e0c187a4ead4fb93"
-  integrity sha512-FxtgKNvvIonoBE1TK7U10VMf6CYvzq8SIZ1XZ1Q8zcn/BEXzPzid3zC9qFiojuI5WXVwWhO8GFqApq0stD+OqQ==
+"@rails/ujs@^7.1.400":
+  version "7.1.400"
+  resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-7.1.400.tgz#b2a76bdccb5197b9e866954536106386c87cfab5"
+  integrity sha512-YwvXm3BR5tn+VCAKYGycLejMRVZE3Ionj5gFjEeGXCZnI0Rpi+7dKpmyu90kdUY7dRUFpHTdu9zZceEzFLl38w==
 
 "@sentry-internal/[email protected]":
   version "8.26.0"