diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-15 06:06:13 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-15 06:06:13 +0000 |
| commit | 3fe34368770022c88fd89c8df58b39bf0789e646 (patch) | |
| tree | 0b8aa07f8b17e4565c491383b5b8b6cc728a1e4a /doc/ci | |
| parent | 41d446ba3f0518097eb350b142ecfbeeb6be83e6 (diff) | |
| download | gitlab-ce-3fe34368770022c88fd89c8df58b39bf0789e646.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci')
| -rw-r--r-- | doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md index f2a7902c9ca..b8976ffae7f 100644 --- a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md +++ b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md @@ -32,8 +32,8 @@ Merge trains have the following requirements and limitations: - This feature requires that [pipelines for merged results](../index.md#pipelines-for-merged-results-premium) are **configured properly**. -- Each merge train can run a maximum of **four** pipelines in parallel. - If more than four merge requests are added to the merge train, the merge requests +- Each merge train can run a maximum of **twenty** pipelines in parallel. + If more than twenty merge requests are added to the merge train, the merge requests will be queued until a slot in the merge train is free. There is no limit to the number of merge requests that can be queued. - This feature does not support [squash and merge](../../../../user/project/merge_requests/squash_and_merge.md). |