diff options
| author | Darby Frey <dfrey@gitlab.com> | 2019-06-17 17:16:13 -0500 |
|---|---|---|
| committer | Darby Frey <dfrey@gitlab.com> | 2019-06-17 17:16:13 -0500 |
| commit | 30efffe38b32e83b49d106a1bd735fb6ee388961 (patch) | |
| tree | b415d88250f79ab0c82acc46fa1ce1a4add3438e /doc/ci | |
| parent | 0260e13629dfdf52f2d23c7af3c3234dab0b2309 (diff) | |
| download | gitlab-ce-30efffe38b32e83b49d106a1bd735fb6ee388961.tar.gz | |
Updated docs with suggested changesmerge-train-docs-change
Diffstat (limited to 'doc/ci')
| -rw-r--r-- | doc/ci/merge_request_pipelines/index.md | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/doc/ci/merge_request_pipelines/index.md b/doc/ci/merge_request_pipelines/index.md index 76e43dfb170..5adb7ebd30d 100644 --- a/doc/ci/merge_request_pipelines/index.md +++ b/doc/ci/merge_request_pipelines/index.md @@ -124,7 +124,7 @@ otherwise pipelines for merged results won't run and your merge requests will be ## Merge Trains **[PREMIUM]** > [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/9186) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.0. -> This feature is disabled by default, but [can be enabled manually](#enabling-merge-trains). Please be aware of [current limitations](#merge-trains-limitations). +> This feature is disabled by default, but [can be enabled manually](#enabling-merge-trains). [Pipelines for merged results](#pipelines-for-merged-results-premium) introduces running a build on the result of the merged code prior to merging, as a way to keep master green. @@ -142,7 +142,7 @@ If the button is subsequently pressed in a different MR, instead of creating a n it creates a new pipeline targeting the merge result of the previous MR plus the target branch. Pipelines invalidated through failures are immediately canceled and requeued. -CAUTION: **Warning:** +CAUTION: **Caution:** At the moment, each merge train can generate a merge ref and run a pipeline **one at a time**. We plan to make the pipelines for merged results [run in parallel](https://gitlab.com/gitlab-org/gitlab-ee/issues/11222) in a future release. ### Enabling Merge Trains @@ -185,10 +185,6 @@ button while the latest pipeline is running.  -### Merge Train's limitations - -- At the moment, each merge train can generate a merge ref and run a pipeline **one at a time**. We plan to make the pipelines for merged results [run in parallel](https://gitlab.com/gitlab-org/gitlab-ee/issues/11222) in a future release. - ## Excluding certain jobs The behavior of the `only: merge_requests` parameter is such that _only_ jobs with |