Merge branch 'main' into CLDC-4140-remove-old-gender-question-lettings

Gemfile

@@ -117,3 +117,6 @@ gem "cssbundling-rails"
 gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby]
 
 gem "excon", "~> 0.111.0"
+
+# faraday is a transitive dependency, but we need to force the version to 2.14.1 to avoid a vulnerability.
+gem "faraday", ">= 2.14.1"

Gemfile.lock

@@ -203,8 +203,10 @@ GEM
       railties (>= 5.0.0)
     faker (3.2.3)
       i18n (>= 1.8.11, < 2)
-    faraday (2.9.0)
+    faraday (2.14.1)
-      faraday-net_http (>= 2.0, < 3.2)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
     faraday-net_http (3.1.0)
@@ -242,6 +244,7 @@ GEM
     jmespath (1.6.2)
     jsbundling-rails (1.3.0)
       railties (>= 6.0.0)
+    json (2.18.1)
     json-schema (4.1.1)
       addressable (>= 2.8)
     jwt (2.8.0)
@@ -568,6 +571,7 @@ DEPENDENCIES
   excon (~> 0.111.0)
   factory_bot_rails
   faker
+  faraday (>= 2.14.1)
   govuk-components (~> 5.7)
   govuk_design_system_formbuilder (~> 5.7)
   govuk_markdown

config/initializers/ostruct.rb

@@ -0,0 +1,2 @@
+# make OpenStruct available globally
+require "ostruct"