From 8298a53523e9a49640f4a6f0b97d97b64ad23cba Mon Sep 17 00:00:00 2001
From: Christina Lohr <clohr@gitlab.com>
Date: Mon, 13 May 2024 09:23:33 +0000
Subject: [PATCH] Update removal milestone for single database deprecation

---
 .../16-1-non-decomposed-mode-deprecation.yml  |  6 +--
 doc/update/deprecations.md                    | 43 +++++++++++--------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/data/deprecations/16-1-non-decomposed-mode-deprecation.yml b/data/deprecations/16-1-non-decomposed-mode-deprecation.yml
index 4fe8e8348c7b5..7a59a7b4dddce 100644
--- a/data/deprecations/16-1-non-decomposed-mode-deprecation.yml
+++ b/data/deprecations/16-1-non-decomposed-mode-deprecation.yml
@@ -1,15 +1,15 @@
 - title: "Running a single database is deprecated"
-  removal_milestone: "18.0"
+  removal_milestone: "19.0"
   announcement_milestone: "16.1"
   breaking_change: true
   reporter: lohrc
   stage: data_stores
   issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/411239
   body: |
-    From GitLab 18.0, we will require a [separate database for CI features](https://gitlab.com/groups/gitlab-org/-/epics/7509).
+    From GitLab 19.0, we will require a [separate database for CI features](https://gitlab.com/groups/gitlab-org/-/epics/7509).
     We recommend running both databases on the same Postgres instance(s) due to ease of management for most deployments.
 
     This change provides additional scalability for the largest of GitLab instances, like GitLab.com.
     This change applies to all installation methods: Omnibus GitLab, GitLab Helm chart, GitLab Operator, GitLab Docker images, and installation from source.
-    Before upgrading to GitLab 18.0, please ensure you have [migrated](https://docs.gitlab.com/ee/administration/postgresql/multiple_databases.html) to two databases.
+    Before upgrading to GitLab 19.0, please ensure you have [migrated](https://docs.gitlab.com/ee/administration/postgresql/multiple_databases.html) to two databases.
   documentation_url: https://docs.gitlab.com/ee/administration/postgresql/multiple_databases.html
diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md
index 7f7962aa58f86..190d895e8d2a2 100644
--- a/doc/update/deprecations.md
+++ b/doc/update/deprecations.md
@@ -50,6 +50,30 @@ For deprecation reviewers (Technical Writers only):
 {::options parse_block_html="true" /}
 
 <div class="js-deprecation-filters"></div>
+<div class="milestone-wrapper" data-milestone="19.0">
+
+## GitLab 19.0
+
+<div class="deprecation breaking-change" data-milestone="19.0">
+
+### Running a single database is deprecated
+
+<div class="deprecation-notes">
+- Announced in GitLab <span class="milestone">16.1</span>
+- Removal in GitLab <span class="milestone">19.0</span> ([breaking change](https://docs.gitlab.com/ee/update/terminology.html#breaking-change))
+- To discuss this change or learn more, see the [deprecation issue](https://gitlab.com/gitlab-org/gitlab/-/issues/411239).
+</div>
+
+From GitLab 19.0, we will require a [separate database for CI features](https://gitlab.com/groups/gitlab-org/-/epics/7509).
+We recommend running both databases on the same Postgres instance(s) due to ease of management for most deployments.
+
+This change provides additional scalability for the largest of GitLab instances, like GitLab.com.
+This change applies to all installation methods: Omnibus GitLab, GitLab Helm chart, GitLab Operator, GitLab Docker images, and installation from source.
+Before upgrading to GitLab 19.0, please ensure you have [migrated](https://docs.gitlab.com/ee/administration/postgresql/multiple_databases.html) to two databases.
+
+</div>
+</div>
+
 <div class="milestone-wrapper" data-milestone="18.0">
 
 ## GitLab 18.0
@@ -409,25 +433,6 @@ Occurrences of the `active` identifier in the GitLab GraphQL API endpoints will
 
 <div class="deprecation breaking-change" data-milestone="18.0">
 
-### Running a single database is deprecated
-
-<div class="deprecation-notes">
-- Announced in GitLab <span class="milestone">16.1</span>
-- Removal in GitLab <span class="milestone">18.0</span> ([breaking change](https://docs.gitlab.com/ee/update/terminology.html#breaking-change))
-- To discuss this change or learn more, see the [deprecation issue](https://gitlab.com/gitlab-org/gitlab/-/issues/411239).
-</div>
-
-From GitLab 18.0, we will require a [separate database for CI features](https://gitlab.com/groups/gitlab-org/-/epics/7509).
-We recommend running both databases on the same Postgres instance(s) due to ease of management for most deployments.
-
-This change provides additional scalability for the largest of GitLab instances, like GitLab.com.
-This change applies to all installation methods: Omnibus GitLab, GitLab Helm chart, GitLab Operator, GitLab Docker images, and installation from source.
-Before upgrading to GitLab 18.0, please ensure you have [migrated](https://docs.gitlab.com/ee/administration/postgresql/multiple_databases.html) to two databases.
-
-</div>
-
-<div class="deprecation breaking-change" data-milestone="18.0">
-
 ### Self-managed certificate-based integration with Kubernetes
 
 <div class="deprecation-notes">
-- 
GitLab