diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2019-05-03 07:44:17 +0000 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-05-03 07:44:17 +0000 |
| commit | f01249ac72e22dac76211c8e5c889ec59e3ce343 (patch) | |
| tree | cd9af53d2634449d907c25b834c61b5947b58a22 | |
| parent | c22aacbf292360426da5580550a5139e1c58d81e (diff) | |
| download | gitlab-ce-docs-pipelines-for-merged-ref-must-use-only-merge-requests.tar.gz | |
Fix the phrasingdocs-pipelines-for-merged-ref-must-use-only-merge-requests
| -rw-r--r-- | doc/ci/merge_request_pipelines/index.md | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/ci/merge_request_pipelines/index.md b/doc/ci/merge_request_pipelines/index.md index 8019d538b08..fd4c649c97a 100644 --- a/doc/ci/merge_request_pipelines/index.md +++ b/doc/ci/merge_request_pipelines/index.md @@ -97,13 +97,16 @@ get out of WIP status or resolve merge conflicts as soon as possible. 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: -1. Make sure your gitlab-ci.yml is [configured properly "Pipelines for merge requests"](#configuring-pipelines-for-merge-requests) 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**. 1. Click **Save changes** button.  +CAUTION: **Warning:** +Make sure your gitlab-ci.yml is [configured properly "Pipelines for merge requests"](#configuring-pipelines-for-merge-requests), +otherwise pipelines for merged results won't run and your merge requests will be stuck as in an unresolved state. + ### Pipelines for Merged Result's limitations - This feature requires [GitLab Runner](https://gitlab.com/gitlab-org/gitlab-runner) 11.9 or newer. |