summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Lewis <mlewis@gitlab.com>2019-06-17 23:25:27 +0000
committerMike Lewis <mlewis@gitlab.com>2019-06-17 23:25:27 +0000
commit11acaf023e0027a88fec63696ba649ecc3eae9b2 (patch)
treefd9d9dfe01041304959df0ba4c1575874639a1a2
parent11810cb2b7185202c5178557ebb6205b27ed4148 (diff)
parent30efffe38b32e83b49d106a1bd735fb6ee388961 (diff)
downloadgitlab-ce-11acaf023e0027a88fec63696ba649ecc3eae9b2.tar.gz
Merge branch 'merge-train-docs-change' into 'master'
Updated docs for Merge Trains See merge request gitlab-org/gitlab-ce!29771
-rw-r--r--doc/ci/merge_request_pipelines/index.md12
1 files changed, 3 insertions, 9 deletions
diff --git a/doc/ci/merge_request_pipelines/index.md b/doc/ci/merge_request_pipelines/index.md
index d8c1cefc8df..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 until we resolve issues with [contention handling](https://gitlab.com/gitlab-org/gitlab-ee/issues/11222), but [can be enabled manually](#enabling-merge-trains).
+> 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,9 +142,8 @@ 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:**
-At this moment, each merge train can generate a merge ref and run a pipeline **one at a time** due to a technical challenge.
-We have [an issue](https://gitlab.com/gitlab-org/gitlab-ee/issues/11222) to tackle this problem to make the pipelines for merged results run in parallel.
+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
@@ -186,11 +185,6 @@ button while the latest pipeline is running.
![Add to merge train when pipeline succeeds](img/merge_train_start_when_pipeline_succeeds.png)
-### Merge Train's limitations
-
-- At this moment, each merge train can generate a merge ref and run a pipeline **one at a time** due to a technical challenge.
- We have [an issue](https://gitlab.com/gitlab-org/gitlab-ee/issues/11222) to tackle this problem to make the pipelines for merged results run in parallel.
-
## Excluding certain jobs
The behavior of the `only: merge_requests` parameter is such that _only_ jobs with