summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Carroll <scarroll@gitlab.com>2019-09-05 21:00:35 +0000
committerSean Carroll <scarroll@gitlab.com>2019-09-05 21:00:35 +0000
commita72b2cb58d000d30e6f0f2c1c3aa6b7ca1562bd4 (patch)
tree327eae0969918b32c4dfbb6b90a131f7a05ca468
parent01b06fd0bb080e671d01c3128e0f8810689ae15a (diff)
downloadgitlab-ce-66616-follow-up-documentation-for-merge-trains-cancel-when-running.tar.gz
Apply suggestion to doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md66616-follow-up-documentation-for-merge-trains-cancel-when-running
-rw-r--r--doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md3
1 files changed, 2 insertions, 1 deletions
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 fbc95a5ede3..d68fba82f4b 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
@@ -65,7 +65,8 @@ otherwise pipelines for merged results won't run and your merge requests will be
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/12996) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.3.
-GitLab CI can detect the presence of redundant pipelines, and will cancel them automatically in order to conserve CI resources.
+GitLab CI can detect the presence of redundant pipelines,
+and will cancel them automatically in order 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