From a06fd71347b2449158f5eb47a622d5e3ec334291 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Jul 2022 11:02:22 +0000
Subject: [PATCH 1/2] Bump govuk_publishing_components from 29.15.1 to 29.15.2

Bumps [govuk_publishing_components](https://github.com/alphagov/govuk_publishing_components) from 29.15.1 to 29.15.2.
- [Release notes](https://github.com/alphagov/govuk_publishing_components/releases)
- [Changelog](https://github.com/alphagov/govuk_publishing_components/blob/main/CHANGELOG.md)
- [Commits](https://github.com/alphagov/govuk_publishing_components/compare/v29.15.1...v29.15.2)

---
updated-dependencies:
- dependency-name: govuk_publishing_components
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 32e71aeff..ffdedb026 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -134,7 +134,7 @@ GEM
     govuk_personalisation (0.12.0)
       plek (>= 1.9.0)
       rails (>= 6, < 8)
-    govuk_publishing_components (29.15.1)
+    govuk_publishing_components (29.15.2)
       govuk_app_config
       govuk_personalisation (>= 0.7.0)
       kramdown
@@ -216,7 +216,7 @@ GEM
       timeout
     netrc (0.11.0)
     nio4r (2.5.8)
-    nokogiri (1.13.7)
+    nokogiri (1.13.8)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     null_logger (0.0.1)
@@ -329,14 +329,11 @@ GEM
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    sentry-rails (5.3.1)
+    sentry-rails (5.4.0)
       railties (>= 5.0)
-      sentry-ruby-core (~> 5.3.1)
-    sentry-ruby (5.3.1)
+      sentry-ruby (~> 5.4.0)
+    sentry-ruby (5.4.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      sentry-ruby-core (= 5.3.1)
-    sentry-ruby-core (5.3.1)
-      concurrent-ruby
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -360,7 +357,7 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     statsd-ruby (1.5.0)
-    strscan (3.0.3)
+    strscan (3.0.4)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     thor (1.2.1)

From b751becdb484ef06f4f5242d124294435583e661 Mon Sep 17 00:00:00 2001
From: Jon Kirwan <87758239+jon-kirwan@users.noreply.github.com>
Date: Thu, 28 Jul 2022 11:03:52 +0100
Subject: [PATCH 2/2] Roll back additional upgrades

Sentry seems to be causing a bug that prevents deployment
---
 Gemfile.lock | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ffdedb026..ee8902103 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -329,11 +329,14 @@ GEM
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    sentry-rails (5.4.0)
+    sentry-rails (5.3.1)
       railties (>= 5.0)
-      sentry-ruby (~> 5.4.0)
-    sentry-ruby (5.4.0)
+      sentry-ruby-core (~> 5.3.1)
+    sentry-ruby (5.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      sentry-ruby-core (= 5.3.1)
+    sentry-ruby-core (5.3.1)
+      concurrent-ruby
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)