Commit 30efffe3 authored by Darby Frey's avatar Darby Frey

Updated docs with suggested changes

parent 0260e136
...@@ -124,7 +124,7 @@ otherwise pipelines for merged results won't run and your merge requests will be ...@@ -124,7 +124,7 @@ otherwise pipelines for merged results won't run and your merge requests will be
## Merge Trains **[PREMIUM]** ## Merge Trains **[PREMIUM]**
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/9186) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.0. > [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 [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. 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 ...@@ -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. 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. 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. 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 ### Enabling Merge Trains
...@@ -185,10 +185,6 @@ button while the latest pipeline is running. ...@@ -185,10 +185,6 @@ button while the latest pipeline is running.
![Add to merge train when pipeline succeeds](img/merge_train_start_when_pipeline_succeeds.png) ![Add to merge train when pipeline succeeds](img/merge_train_start_when_pipeline_succeeds.png)
### 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 ## Excluding certain jobs
The behavior of the `only: merge_requests` parameter is such that _only_ jobs with The behavior of the `only: merge_requests` parameter is such that _only_ jobs with
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment