Merge branch 'master' into dependabot/bundler/rubocop-govuk-4.14.0

Gemfile

@@ -5,7 +5,7 @@ gem "aws-sdk-s3", "~> 1"
 gem "mail", "~> 2.8"
 gem "mysql2"
 gem "net-smtp"
-gem "nokogiri", "~> 1.13"
+gem "nokogiri", "~> 1.15"
 gem "notifications-ruby-client", "~> 5.4.0"
 gem "puma"
 gem "rake", "~> 13.0"

Gemfile.lock

@@ -74,7 +74,7 @@ GEM
       net-smtp
     method_source (1.0.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.0)
+    mini_portile2 (2.8.2)
     minitest (5.21.2)
     multipart-post (2.1.1)
     mustermann (3.0.0)
@@ -86,13 +86,13 @@ GEM
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.1)
+    net-protocol (0.2.2)
       timeout
-    net-smtp (0.3.3)
+    net-smtp (0.4.0.1)
       net-protocol
-    nio4r (2.5.9)
-    nokogiri (1.13.10)
-      mini_portile2 (~> 2.8.0)
+    nio4r (2.7.0)
+    nokogiri (1.15.3)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -107,13 +107,13 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (5.0.0)
-    puma (6.2.1)
+    puma (6.4.2)
       nio4r (~> 2.0)
-    racc (1.6.1)
+    racc (1.7.1)
     rack (2.2.8)
     rack-protection (3.0.2)
       rack
-    rack-test (2.0.2)
+    rack-test (2.1.0)
       rack (>= 1.3)
     rainbow (3.1.1)
     rake (13.0.6)
@@ -193,7 +193,7 @@ GEM
     thor (1.0.1)
     tilt (2.0.11)
     timecop (0.9.6)
-    timeout (0.3.2)
+    timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
@@ -213,7 +213,7 @@ DEPENDENCIES
   mail (~> 2.8)
   mysql2
   net-smtp
-  nokogiri (~> 1.13)
+  nokogiri (~> 1.15)
   notifications-ruby-client (~> 5.4.0)
   puma
   rack-test