diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-14 15:09:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-14 15:09:51 +0300 |
commit | 3a19c55d3a1dda9e0ea041d910bf31d1ddda7acd (patch) | |
tree | 2ef73d75c8206531027f7e7718ac7ce00ce13126 /doc/ci | |
parent | 8a7464317976dc9e2bdad560505dd0959bb03f1f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci')
-rw-r--r-- | doc/ci/components/catalog.md | 11 | ||||
-rw-r--r-- | doc/ci/pipelines/merge_request_pipelines.md | 11 |
2 files changed, 13 insertions, 9 deletions
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 |