summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-04-17 09:10:10 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2019-04-17 09:10:10 +0000
commit2c5398ee96799440523a03c7c770e90a9629762a (patch)
treea5c7a249d3935877e3679273d583872492fc558d /doc
parent8c3b529cbf35852c6059955d424464280702bd88 (diff)
parentf5155180aad9162982caf5090523e08d85e29f8f (diff)
downloadgitlab-ce-2c5398ee96799440523a03c7c770e90a9629762a.tar.gz
Merge branch 'docs/merge-request-pipelines' into 'master'
Add note about MR Pipeline Runner version Closes gitlab-ee#11122 See merge request gitlab-org/gitlab-ce!27330
Diffstat (limited to 'doc')
-rw-r--r--doc/ci/merge_request_pipelines/index.md8
1 files changed, 7 insertions, 1 deletions
diff --git a/doc/ci/merge_request_pipelines/index.md b/doc/ci/merge_request_pipelines/index.md
index 4f61e97bd8a..2de751c9e62 100644
--- a/doc/ci/merge_request_pipelines/index.md
+++ b/doc/ci/merge_request_pipelines/index.md
@@ -1,5 +1,11 @@
# Pipelines for merge requests
+NOTE: **Note**:
+As of GitLab 11.10, pipelines for merge requests require GitLab Runner 11.9
+or higher due to the [recent refspecs
+changes](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25504).
+Anything lower will cause the pipeline to fail.
+
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/15310) in GitLab 11.6.
Usually, when you create a new merge request, a pipeline runs with the
@@ -68,7 +74,7 @@ when a merge request was created or updated. For example:
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
-create a new ref that contains the merge result of the source and target branch
+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.