From 0a232de09d18a93b893492ec83001c8e5f8832d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Aug 2024 09:08:08 +0000
Subject: [PATCH 1/3] Bump mongoid from 8.1.2 to 9.0.1

Bumps [mongoid](https://github.com/mongodb/mongoid) from 8.1.2 to 9.0.1.
- [Release notes](https://github.com/mongodb/mongoid/releases)
- [Changelog](https://github.com/mongodb/mongoid/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mongodb/mongoid/compare/v8.1.2...v9.0.1)

---
updated-dependencies:
- dependency-name: mongoid
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 2b98f611a..9bb37656a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -114,7 +114,7 @@ GEM
       sassc (>= 2.0.0)
     brakeman (6.1.2)
       racc
-    bson (4.15.0)
+    bson (5.0.1)
     builder (3.3.0)
     byebug (11.1.3)
     capybara (3.40.0)
@@ -340,7 +340,7 @@ GEM
     mime-types-data (3.2024.0702)
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
-    minitest (5.24.1)
+    minitest (5.25.1)
     minitest-reporters (1.7.1)
       ansi
       builder
@@ -354,11 +354,10 @@ GEM
       railties (>= 3.1)
     mongo (2.20.1)
       bson (>= 4.14.1, < 6.0.0)
-    mongoid (8.1.2)
-      activemodel (>= 5.1, < 7.1, != 7.0.0)
+    mongoid (9.0.1)
+      activemodel (>= 5.1, < 7.2, != 7.0.0)
       concurrent-ruby (>= 1.0.5, < 2.0)
       mongo (>= 2.18.0, < 3.0.0)
-      ruby2_keywords (~> 0.0.5)
     mongoid-sadstory (0.0.2)
       mongoid
     mousetrap-rails (1.4.6)

From 4f5ec557dee147b2dfdc6325bb50110ec9b8cd13 Mon Sep 17 00:00:00 2001
From: Mark Taylor <138604938+mtaylorgds@users.noreply.github.com>
Date: Wed, 21 Aug 2024 10:23:01 +0100
Subject: [PATCH 2/3] Undo bson gem update

V5 of the bson gem causes errors when running Mainstream Publisher,
 which have yet to be resolved. So, for now, we cannot update bson.
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9bb37656a..2895a5472 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -114,7 +114,7 @@ GEM
       sassc (>= 2.0.0)
     brakeman (6.1.2)
       racc
-    bson (5.0.1)
+    bson (4.15.0)
     builder (3.3.0)
     byebug (11.1.3)
     capybara (3.40.0)

From 4233ec2afc66dc6db146666b606dde7f8a554f11 Mon Sep 17 00:00:00 2001
From: Mark Taylor <138604938+mtaylorgds@users.noreply.github.com>
Date: Wed, 21 Aug 2024 11:28:41 +0100
Subject: [PATCH 3/3] Remove redudant mongoid config

The `use_activesupport_time_zone` Mongoid configuration was deprecated
 in v8, and has been removed in v9 of Mongoid.

The [default value for this setting](https://www.mongodb.com/docs/mongoid/current/release-notes/mongoid-8.1/#deprecated-use_activesupport_time_zone-config-option)
 was `true`, which is what it was set to in our config anyway.
---
 config/mongoid.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/config/mongoid.yml b/config/mongoid.yml
index 6fb3116cf..2d7795039 100644
--- a/config/mongoid.yml
+++ b/config/mongoid.yml
@@ -4,7 +4,6 @@ development:
     default:
       uri: <%= ENV["MONGODB_URI"] || "mongodb://localhost/govuk_content_development" %>
   options:
-    use_activesupport_time_zone: true
     belongs_to_required_by_default: false
 
 test:
@@ -16,7 +15,6 @@ test:
           mode: :primary
         max_pool_size: 1
   options:
-    use_activesupport_time_zone: true
     belongs_to_required_by_default: false
 
 # set these environment variables on your prod server
@@ -25,5 +23,4 @@ production:
     default:
       uri: <%= ENV['MONGODB_URI'] %>
   options:
-    use_activesupport_time_zone: true
     belongs_to_required_by_default: false