Add latest changes from gitlab-org/gitlab@master

2 files changed, 11 insertions, 2 deletions

diff --git a/data/deprecations/15-9-database-single-database-connection-conf.yml b/data/deprecations/15-9-database-single-database-connection-conf.yml
index ee66c987032..de4ae51d615 100644
--- a/data/deprecations/15-9-database-single-database-connection-conf.yml
+++ b/data/deprecations/15-9-database-single-database-connection-conf.yml
@@ -6,6 +6,8 @@
   stage: Enablement
   issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/387898
   body: |
+    This deprecation is now superseded by another [deprecation notice](#running-a-single-database-is-deprecated).
+
     Previously, [GitLab's database](https://docs.gitlab.com/omnibus/settings/database.html)
     configuration had a single `main:` section. This is being deprecated. The new
     configuration has both a `main:` and a `ci:` section.
@@ -14,6 +16,4 @@
     to [add the `ci:` section](https://docs.gitlab.com/ee/install/installation.html#configure-gitlab-db-settings).
     Omnibus, the Helm chart, and Operator will handle this configuration
     automatically from GitLab 16.0 onwards.
-
-    This change is a preparation to deprecate two connections in favor of two databases in 16.1.
   documentation_url: https://docs.gitlab.com/ee/install/installation.html#configure-gitlab-db-settings
diff --git a/data/deprecations/16-1-non-decomposed-mode-deprecation.yml b/data/deprecations/16-1-non-decomposed-mode-deprecation.yml
new file mode 100644
index 00000000000..963fc0d8230
--- /dev/null
+++ b/data/deprecations/16-1-non-decomposed-mode-deprecation.yml
@@ -0,0 +1,9 @@
+- title: "Running a single database is deprecated"
+  removal_milestone: "17.0"
+  announcement_milestone: "16.1"
+  breaking_change: true
+  reporter: lohrc
+  stage: data_stores
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/411239
+  body: |
+    The option to run self-managed installations of GitLab on a single database is now deprecated. From GitLab 17.0, we will require a [separate database for CI features](https://gitlab.com/groups/gitlab-org/-/epics/7509). With this change, self-managed versions of GitLab will behave similarly to GitLab.com. This change applies to installation methods with Omnibus GitLab, GitLab Helm chart, GitLab Operator, GitLab Docker images, and installation from source. Before upgrading to GitLab 17.0, please ensure [migration](https://docs.gitlab.com/ee/administration/postgresql/multiple_databases.html) to two databases.