diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-15 03:08:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-15 03:08:42 +0300 |
| commit | 6a0085290e97f344d3ed69463c8a1f729a337bc4 (patch) | |
| tree | 792f6edfaf71b3b331604a6561860eb988df8291 /doc/ci/merge_request_pipelines | |
| parent | 5c635722c66a32e170c3ba8150bc303124abb7a1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/merge_request_pipelines')
| -rw-r--r-- | doc/ci/merge_request_pipelines/index.md | 1 | ||||
| -rw-r--r-- | doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/doc/ci/merge_request_pipelines/index.md b/doc/ci/merge_request_pipelines/index.md index 1fc5283f604..cc0b4ac1f86 100644 --- a/doc/ci/merge_request_pipelines/index.md +++ b/doc/ci/merge_request_pipelines/index.md @@ -24,7 +24,6 @@ can run a pipeline for merge requests.  -NOTE: **Note:** If you use this feature with [merge when pipeline succeeds](../../user/project/merge_requests/merge_when_pipeline_succeeds.md), pipelines for merge requests take precedence over the other regular pipelines. 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 1f88e8f832f..45cae49377f 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 @@ -37,7 +37,6 @@ run. To add a merge request to a merge train, you need [permissions](../../../../user/permissions.md) to push to the target branch. -NOTE: **Note:** 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 |