Add latest changes from gitlab-org/gitlab@master

14 files changed, 23 insertions, 4 deletions

diff --git a/doc/.linting/vale/styles/gitlab/Contractions.yml b/doc/.vale/gitlab/Contractions.yml
index 5f389bd1ea4..5f389bd1ea4 100644
--- a/doc/.linting/vale/styles/gitlab/Contractions.yml
+++ b/doc/.vale/gitlab/Contractions.yml
diff --git a/doc/.linting/vale/styles/gitlab/FirstPerson.yml b/doc/.vale/gitlab/FirstPerson.yml
index 18c5265b0a6..18c5265b0a6 100644
--- a/doc/.linting/vale/styles/gitlab/FirstPerson.yml
+++ b/doc/.vale/gitlab/FirstPerson.yml
diff --git a/doc/.linting/vale/styles/gitlab/InternalLinkExtension.yml b/doc/.vale/gitlab/InternalLinkExtension.yml
index d07a2600798..d07a2600798 100644
--- a/doc/.linting/vale/styles/gitlab/InternalLinkExtension.yml
+++ b/doc/.vale/gitlab/InternalLinkExtension.yml
diff --git a/doc/.linting/vale/styles/gitlab/LatinTerms.yml b/doc/.vale/gitlab/LatinTerms.yml
index 8412631f8fe..8412631f8fe 100644
--- a/doc/.linting/vale/styles/gitlab/LatinTerms.yml
+++ b/doc/.vale/gitlab/LatinTerms.yml
diff --git a/doc/.linting/vale/styles/gitlab/OxfordComma.yml b/doc/.vale/gitlab/OxfordComma.yml
index 4b37ba8c2b9..4b37ba8c2b9 100644
--- a/doc/.linting/vale/styles/gitlab/OxfordComma.yml
+++ b/doc/.vale/gitlab/OxfordComma.yml
diff --git a/doc/.linting/vale/styles/gitlab/RelativeLinks.yml b/doc/.vale/gitlab/RelativeLinks.yml
index 95bd60dd6e4..95bd60dd6e4 100644
--- a/doc/.linting/vale/styles/gitlab/RelativeLinks.yml
+++ b/doc/.vale/gitlab/RelativeLinks.yml
diff --git a/doc/.linting/vale/styles/gitlab/SentenceSpacing.yml b/doc/.vale/gitlab/SentenceSpacing.yml
index b061f7f6f9e..b061f7f6f9e 100644
--- a/doc/.linting/vale/styles/gitlab/SentenceSpacing.yml
+++ b/doc/.vale/gitlab/SentenceSpacing.yml
diff --git a/doc/.linting/vale/styles/gitlab/Substitutions.yml b/doc/.vale/gitlab/Substitutions.yml
index b32a03e17d5..b32a03e17d5 100644
--- a/doc/.linting/vale/styles/gitlab/Substitutions.yml
+++ b/doc/.vale/gitlab/Substitutions.yml
diff --git a/doc/ci/review_apps/img/enable_review_app_v12_8.png b/doc/ci/review_apps/img/enable_review_app_v12_8.png
index 7d40f49725f..264e4834e72 100644
--- a/doc/ci/review_apps/img/enable_review_app_v12_8.png
+++ b/doc/ci/review_apps/img/enable_review_app_v12_8.png
diff --git a/doc/development/contributing/issue_workflow.md b/doc/development/contributing/issue_workflow.md
index 4d84e921acf..46d1d4c2414 100644
--- a/doc/development/contributing/issue_workflow.md
+++ b/doc/development/contributing/issue_workflow.md
@@ -81,6 +81,8 @@ already reserved for category labels).
 The descriptions on the [labels page](https://gitlab.com/groups/gitlab-org/-/labels)
 explain what falls under each type label.
 
+The GitLab handbook documents [when something is a bug and when it is a feature request.](https://about.gitlab.com/handbook/product/product-management/process/feature-or-bug.html)
+
 ### Facet labels
 
 Sometimes it's useful to refine the type of an issue. In those cases, you can
diff --git a/doc/development/event_tracking/backend.md b/doc/development/event_tracking/backend.md
new file mode 100644
index 00000000000..dc4d7279671
--- /dev/null
+++ b/doc/development/event_tracking/backend.md
@@ -0,0 +1,5 @@
+---
+redirect_to: '../../telemetry/backend.md'
+---
+
+This document was moved to [another location](../../telemetry/backend.md).
diff --git a/doc/development/event_tracking/frontend.md b/doc/development/event_tracking/frontend.md
new file mode 100644
index 00000000000..0e98daf15bb
--- /dev/null
+++ b/doc/development/event_tracking/frontend.md
@@ -0,0 +1,5 @@
+---
+redirect_to: '../../telemetry/frontend.md'
+---
+
+This document was moved to [another location](../../telemetry/frontend.md).
diff --git a/doc/development/event_tracking/index.md b/doc/development/event_tracking/index.md
new file mode 100644
index 00000000000..ae555e99c6b
--- /dev/null
+++ b/doc/development/event_tracking/index.md
@@ -0,0 +1,5 @@
+---
+redirect_to: '../../telemetry/index.md'
+---
+
+This document was moved to [another location](../../telemetry/index.md).
diff --git a/doc/policy/maintenance.md b/doc/policy/maintenance.md
index 1739c07ccd5..028e372985d 100644
--- a/doc/policy/maintenance.md
+++ b/doc/policy/maintenance.md
@@ -127,7 +127,7 @@ one major version. For example, it is safe to:
   - `9.5.5` -> `9.5.9`
   - `10.6.3` -> `10.6.6`
   - `11.11.1` -> `11.11.8`
-  - `12.0.4` -> `12.0.9`
+  - `12.0.4` -> `12.0.12`
 - Upgrade the minor version:
   - `8.9.4` -> `8.12.3`
   - `9.2.3` -> `9.5.5`
@@ -144,9 +144,10 @@ It's also important to ensure that any background migrations have been fully com
 before upgrading to a new major version. To see the current size of the `background_migration` queue,
 [Check for background migrations before upgrading](../update/README.md#checking-for-background-migrations-before-upgrading).
 
-To ensure background migrations are successful, increment by one minor version during the version jump before installing newer releases.
+From version 12 onwards, an additional step is required. More significant migrations may occur during major release upgrades. To ensure these are successful, increment to the first minor version (`x.0.x`) during the major version jump. Then proceed with upgrading to a newer release.
+
+For example: `11.11.x` -> `12.0.x` -> `12.8.x`
 
-For example: `11.11.x` -> `12.0.x`
 Please see the table below for some examples:
 
 | Latest stable version | Your version | Recommended upgrade path | Note |
@@ -154,7 +155,8 @@ Please see the table below for some examples:
 | 9.4.5                 | 8.13.4       | `8.13.4` -> `8.17.7` -> `9.4.5`                          | `8.17.7` is the last version in version `8` |
 | 10.1.4                | 8.13.4       | `8.13.4 -> 8.17.7 -> 9.5.10 -> 10.1.4`                   | `8.17.7` is the last version in version `8`, `9.5.10` is the last version in version `9` |
 | 11.3.4                | 8.13.4       | `8.13.4` -> `8.17.7` -> `9.5.10` -> `10.8.7` -> `11.3.4` | `8.17.7` is the last version in version `8`, `9.5.10` is the last version in version `9`, `10.8.7` is the last version in version `10` |
-| 12.5.8                | 11.3.4       | `11.3.4` -> `11.11.8` -> `12.0.9` -> `12.5.8`            | `11.11.8` is the last version in version `11` |
+| 12.5.8                | 11.3.4       | `11.3.4` -> `11.11.8` -> `12.0.12` -> `12.5.8`            | `11.11.8` is the last version in version `11`. `12.0.x` [is a required step.](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23211#note_272842444) |
+| 12.8.5                | 9.2.6       | `9.2.6` -> `9.5.10` -> `10.8.7` -> `11.11.8` -> `12.0.12` -> `12.8.5` | Four intermediate versions required: the final 9.5, 10.8, 11.11 releases, plus 12.0 |
 
 More information about the release procedures can be found in our
 [release documentation](https://gitlab.com/gitlab-org/release/docs). You may also want to read our