From 2b3682251b70be67bc08a61b4fc087a28db3365a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Jan 2023 11:01:22 +0000
Subject: [PATCH 1/2] Bump govuk_app_config from 4.11.1 to 4.12.0

Bumps [govuk_app_config](https://github.com/alphagov/govuk_app_config) from 4.11.1 to 4.12.0.
- [Release notes](https://github.com/alphagov/govuk_app_config/releases)
- [Changelog](https://github.com/alphagov/govuk_app_config/blob/main/CHANGELOG.md)
- [Commits](https://github.com/alphagov/govuk_app_config/compare/v4.11.1...v4.12.0)

---
updated-dependencies:
- dependency-name: govuk_app_config
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1a1e21a36..ebd405237 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -124,7 +124,7 @@ GEM
     globalid (1.0.0)
       activesupport (>= 5.0)
     govuk_ab_testing (2.4.2)
-    govuk_app_config (4.11.1)
+    govuk_app_config (4.12.0)
       logstasher (~> 2.1)
       plek (>= 4, < 6)
       prometheus_exporter (~> 2.0)
@@ -194,8 +194,8 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
-    minitest (5.16.3)
+    mini_portile2 (2.8.1)
+    minitest (5.17.0)
     minitest-reporters (1.5.0)
       ansi
       builder
@@ -229,10 +229,10 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (5.0.0)
-    puma (6.0.1)
+    puma (6.0.2)
       nio4r (~> 2.0)
     racc (1.6.2)
-    rack (2.2.4)
+    rack (2.2.5)
     rack-proxy (0.7.4)
       rack
     rack-test (2.0.2)

From d9a04c12eb8b234dbcfb86cffca11af0a2b2b8da Mon Sep 17 00:00:00 2001
From: Kevin Dew <kevindew@me.com>
Date: Wed, 4 Jan 2023 21:16:59 +0000
Subject: [PATCH 2/2] Resolve dual CSP configurations

This is to resolve the presence of two content security policy files
that both initialise the CSP.

It chooses to use content_security_policy.rb as that is a Rails
default.
---
 config/initializers/csp.rb | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 config/initializers/csp.rb

diff --git a/config/initializers/csp.rb b/config/initializers/csp.rb
deleted file mode 100644
index aa49407c8..000000000
--- a/config/initializers/csp.rb
+++ /dev/null
@@ -1 +0,0 @@
-GovukContentSecurityPolicy.configure