diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-08 09:08:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-08 09:08:35 +0300 |
| commit | 028d8ac9fdde17782cc002563ecd7c5f77ea699f (patch) | |
| tree | b9e0c09d81cf7feb8abcb05983a5b8887f37e7cd /doc/ci/merge_request_pipelines | |
| parent | f77969819ac54a13966f16153cae23a66590cc35 (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 | 5 | ||||
| -rw-r--r-- | doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/doc/ci/merge_request_pipelines/index.md b/doc/ci/merge_request_pipelines/index.md index 3ce62936168..1fc5283f604 100644 --- a/doc/ci/merge_request_pipelines/index.md +++ b/doc/ci/merge_request_pipelines/index.md @@ -125,8 +125,9 @@ Therefore: - Since `C` specifies that it should only run for merge requests, it will not run for any pipeline except a merge request pipeline. -This helps you avoid having to add the `only:` rule to all of your jobs -in order to make them always run. You can use this format to set up a Review App, helping to save resources. +This helps you avoid having to add the `only:` rule to all of your jobs to make +them always run. You can use this format to set up a Review App, helping to +save resources. #### Excluding certain branches diff --git a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md index dd08f9248f6..2330bdb4c7c 100644 --- a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md +++ b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md @@ -80,8 +80,8 @@ For more information, read the [documentation on Merge Trains](merge_trains/inde > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/12996) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.3. -GitLab CI/CD can detect the presence of redundant pipelines, -and will cancel them automatically in order to conserve CI resources. +GitLab CI/CD can detect the presence of redundant pipelines, and cancels them +to conserve CI resources. When a user merges a merge request immediately within an ongoing merge train, the train will be reconstructed, as it will recreate the expected |