diff options
author | Achilleas Pipinellis <axil@gitlab.com> | 2019-05-20 18:07:49 +0000 |
---|---|---|
committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-05-21 13:50:32 +0000 |
commit | 610e394f48bba331c8921c1df464536297388cb4 (patch) | |
tree | e4f7e2974abd50838ef7172b57f9b1e0c8dfd69f /doc | |
parent | 929a4f8bbfcb78e900da9e571fe1d61534bf2531 (diff) | |
download | gitlab-ce-610e394f48bba331c8921c1df464536297388cb4.tar.gz |
Merge branch 'docs/clarify-defaulting-behaviour-pipelines-for-mr' into 'master'
Fix content to not contradict
Closes #61270
See merge request gitlab-org/gitlab-ce!28456
(cherry picked from commit 0bf8204a266ad8e836c49247470a8360123fa503)
ec3e0da8 Fix content to not contradict
19b05a42 Apply suggestion to doc/ci/merge_request_pipelines/index.md
Diffstat (limited to 'doc')
-rw-r--r-- | doc/ci/merge_request_pipelines/index.md | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/doc/ci/merge_request_pipelines/index.md b/doc/ci/merge_request_pipelines/index.md index 3c26a38e3de..cb803cb4c3f 100644 --- a/doc/ci/merge_request_pipelines/index.md +++ b/doc/ci/merge_request_pipelines/index.md @@ -70,15 +70,18 @@ when a merge request was created or updated. For example: ## Pipelines for Merged Results **[PREMIUM]** > [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/7380) in [GitLab Premium](https://about.gitlab.com/pricing/) 11.10. +> This feature is disabled by default until we resolve issues with [contention handling](https://gitlab.com/gitlab-org/gitlab-ee/issues/9186), but [can be enabled manually](#enabling-pipelines-for-merged-results). It's possible for your source and target branches to diverge, which can result in the scenario that source branch's pipeline was green, the target's pipeline was green, -but the combined output fails. By having your merge request pipeline automatically +but the combined output fails. + +By having your merge request pipeline automatically create a new ref that contains the merge result of the source and target branch (then running a pipeline on that ref), we can better test that the combined result is also valid. -From GitLab 11.10, pipelines for merge requests run by default +GitLab can run pipelines for merge requests on this merged result. That is, where the source and target branches are combined into a new ref and a pipeline for this ref validates the result prior to merging. @@ -95,7 +98,7 @@ get out of WIP status or resolve merge conflicts as soon as possible. ### Enabling Pipelines for Merged Results -This feature disabled by default until we resolve issues with [contention handling](https://gitlab.com/gitlab-org/gitlab-ee/issues/9186). It can be enabled at the project level: +To enable pipelines on merged results at the project level: 1. Visit your project's **Settings > General** and expand **Merge requests**. 1. Check **Merge pipelines will try to validate the post-merge result prior to merging**. |