Add latest changes from gitlab-org/gitlab@master

6 files changed, 70 insertions, 16 deletions

diff --git a/doc/administration/backup_restore/backup_large_reference_architectures.md b/doc/administration/backup_restore/backup_large_reference_architectures.md
index 4e11a707052..8e03ae7aded 100644
--- a/doc/administration/backup_restore/backup_large_reference_architectures.md
+++ b/doc/administration/backup_restore/backup_large_reference_architectures.md
@@ -48,7 +48,38 @@ There is a feature proposal to add the ability to back up repositories directly
 
   1. Spin up a VM with 8 vCPU and 7.2 GB memory. This node will be used to back up Git repositories. Note that
      [a Praefect node cannot be used to back up Git data](https://gitlab.com/gitlab-org/gitlab/-/issues/396343#note_1385950340).
-  1. Configure the node as another **GitLab Rails** node as defined in your [reference architecture](../reference_architectures/index.md). As with other GitLab Rails nodes, this node must have access to your main Postgres database as well as to Gitaly Cluster.
+  1. Configure the node as another **GitLab Rails** node as defined in your [reference architecture](../reference_architectures/index.md).
+     As with other GitLab Rails nodes, this node must have access to your main PostgreSQL database, Redis, object storage, and Gitaly Cluster.
+  1. Ensure the GitLab application isn't running on this node by disabling most services:
+
+     1. Edit `/etc/gitlab/gitlab.rb` to ensure the following services are disabled.
+        `roles(['application_role'])` disables Redis, PostgreSQL, and Consul, and
+        is the basis of the reference architecture Rails node definition.
+
+        ```ruby
+        roles(['application_role'])
+        gitlab_workhorse['enable'] = false
+        puma['enable'] = false
+        sidekiq['enable'] = false
+        gitlab_kas['enable'] = false
+        gitaly['enable'] = false
+        prometheus_monitoring['enable'] = false
+        ```
+
+     1. Reconfigure GitLab:
+
+        ```shell
+        sudo gitlab-ctl reconfigure
+        ```
+
+     1. The only service that should be left is `logrotate`, you can verify with:
+
+        ```shell
+        gitlab-ctl status
+        ```
+
+     There is [a feature request](https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6823) for a role in the Linux package
+     that meets these requirements.
 
 To back up the Git repositories:
 
diff --git a/doc/administration/packages/container_registry.md b/doc/administration/packages/container_registry.md
index 308ca7b379e..92af1a785ce 100644
--- a/doc/administration/packages/container_registry.md
+++ b/doc/administration/packages/container_registry.md
@@ -380,10 +380,23 @@ The different supported drivers are:
 | `azure`      | Microsoft Azure Blob Storage         |
 | `gcs`        | Google Cloud Storage                 |
 | `s3`         | Amazon Simple Storage Service. Be sure to configure your storage bucket with the correct [S3 Permission Scopes](https://docs.docker.com/registry/storage-drivers/s3/#s3-permission-scopes). |
-| `swift`      | OpenStack Swift Object Storage       |
-| `oss`        | Aliyun OSS                           |
 
-Although most S3 compatible services (like [MinIO](https://min.io/)) should work with the container registry, we only guarantee support for AWS S3. Because we cannot assert the correctness of third-party S3 implementations, we can debug issues, but we cannot patch the registry unless an issue is reproducible against an AWS S3 bucket.
+Although most S3 compatible services (like [MinIO](https://min.io/)) should work with the container registry,
+we only guarantee support for AWS S3. Because we cannot assert the correctness of third-party S3 implementations,
+we can debug issues, but we cannot patch the registry unless an issue is reproducible against an AWS S3 bucket.
+
+<!--- start_remove The following content will be removed on remove_date: '2024-05-16' -->
+
+WARNING:
+Support for the following drivers was [deprecated](https://gitlab.com/gitlab-org/container-registry/-/issues/1141)
+in GitLab 16.6, and is planned for removal in 17.0. This change is a breaking change.
+
+| Driver  | Description |
+|---------|-------------|
+| `swift` | OpenStack Swift Object Storage |
+| `oss`   | Aliyun OSS  |
+
+<!--- end_remove -->
 
 ### Use file system
 
diff --git a/doc/ci/components/catalog.md b/doc/ci/components/catalog.md
index 7766623d2d4..e4d4d8c82ab 100644
--- a/doc/ci/components/catalog.md
+++ b/doc/ci/components/catalog.md
@@ -42,8 +42,11 @@ After the repository is set as a components repository, it appears in the CI/CD
 
 ## View available components in the CI/CD Catalog
 
-To view the components available to your project from the CI/CD Catalog:
+To access the CI/CD Catalog and view the published components that are available to you:
 
-1. On the left sidebar, select **Search or go to** and find your project.
-1. On the left sidebar, select **Build > Pipeline Editor**.
-1. Select **Browse CI/CD Catalog**.
+1. On the left sidebar, select **Search or go to**.
+1. Select **Explore**.
+1. Select **CI/CD Catalog**.
+
+Alternatively, if you are already in the [pipeline editor](../pipeline_editor/index.md)
+in your project, you can select **Browse CI/CD Catalog**.
diff --git a/doc/ci/pipelines/merge_request_pipelines.md b/doc/ci/pipelines/merge_request_pipelines.md
index fb1c19d8770..69714363126 100644
--- a/doc/ci/pipelines/merge_request_pipelines.md
+++ b/doc/ci/pipelines/merge_request_pipelines.md
@@ -39,19 +39,20 @@ Both of these types of pipelines can appear on the **Pipelines** tab of a merge
 
 ## Types of merge request pipelines
 
+> - The `detached` label was [changed](https://gitlab.com/gitlab-org/gitlab/-/issues/352939) to `merge request` in GitLab 14.9.
+> - The `merged results` label was [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132975) in GitLab 16.5.
+
 The three types of merge request pipelines are:
 
 - Merge request pipelines, which run on the changes in the merge request's
-  source branch. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/352939)
-  in GitLab 14.9, these pipelines display a `merge request` label to indicate that the
-  pipeline ran only on the contents of the source branch, ignoring the target branch.
-  In GitLab 14.8 and earlier, the label is `detached`.
+  source branch, ignoring the target branch. These pipelines display a `merge request` label in pipeline lists.
 - [Merged results pipelines](merged_results_pipelines.md), which run on
   the result of combining the source branch's changes with the target branch.
+  These pipelines display a `merged results` label in pipeline lists.
 - [Merge trains](merge_trains.md), which run when merging multiple merge requests
   at the same time. The changes from each merge request are combined into the
   target branch with the changes in the earlier enqueued merge requests, to ensure
-  they all work together.
+  they all work together. These pipelines display a `merge train` label in pipeline lists.
 
 ## Prerequisites
 
diff --git a/doc/user/markdown.md b/doc/user/markdown.md
index d8b3ed3c56a..779079119d0 100644
--- a/doc/user/markdown.md
+++ b/doc/user/markdown.md
@@ -464,13 +464,15 @@ The following paragraphs use HTML to work around a Markdown bug.
 Do not change it back to a Markdown backticks.
 For more information, see https://gitlab.com/gitlab-org/gitlab/-/issues/359077.
 -->
+<!-- vale gitlab.Uppercase = NO -->
 A table of contents is an unordered list that links to subheadings in the document.
 You can add a table of contents to issues and merge requests, but you can't add one
-to notes or comments. Add either the `[[_TOC_]]` or <code>`[TOC]`</code> tag on its own line
+to notes or comments. Add either the `[[_TOC_]]` or <code>[TOC]</code> tag on its own line
 to the **Description** field of any of the supported content types:
+<!-- vale gitlab.Uppercase = YES -->
 
 NOTE:
-A TOC renders also when you use <code>`[TOC]`</code>, regardless of being on its own line or not.
+A table of contents renders also when you use <code>`[TOC]`</code>, regardless of being on its own line or not.
 This behavior is unintended. For more information, see [issue 359077](https://gitlab.com/gitlab-org/gitlab/-/issues/359077).
 
 - Markdown files.
diff --git a/doc/user/packages/container_registry/index.md b/doc/user/packages/container_registry/index.md
index cbc031741bd..ee32157224f 100644
--- a/doc/user/packages/container_registry/index.md
+++ b/doc/user/packages/container_registry/index.md
@@ -168,6 +168,10 @@ this setting. However, disabling the container registry disables all Container R
 
 ## Supported image types
 
-The container registry supports [Docker V2](https://docs.docker.com/registry/spec/manifest-v2-2/) and [Open Container Initiative (OCI)](https://github.com/opencontainers/image-spec/blob/main/spec.md) image formats.
+> OCI conformance [introduced](https://gitlab.com/groups/gitlab-org/-/epics/10345) in GitLab 16.6.
+
+The container registry supports the [Docker V2](https://docs.docker.com/registry/spec/manifest-v2-2/)
+and [Open Container Initiative (OCI)](https://github.com/opencontainers/image-spec/blob/main/spec.md)
+image formats. Additionally, the container registry [conforms to the OCI distribution specification](https://conformance.opencontainers.org/#gitlab-container-registry).
 
 OCI support means that you can host OCI-based image formats in the registry, such as [Helm 3+ chart packages](https://helm.sh/docs/topics/registries/). There is no distinction between image formats in the GitLab [API](../../../api/container_registry.md) and the UI. [Issue 38047](https://gitlab.com/gitlab-org/gitlab/-/issues/38047) addresses this distinction, starting with Helm.