summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-08-21 03:28:29 +0000
committerEvan Read <eread@gitlab.com>2019-08-21 03:28:29 +0000
commitda573ae259f132e8a557001f54d58037f2534753 (patch)
treeb85d88d972c9979300825e43bea27d994c1bb751 /doc
parentdc859813e3af335e85cf5cb42e56f3a4c74dc78a (diff)
parent505dfe5939f4faf4d297e939aa84771f17eaae33 (diff)
downloadgitlab-ce-da573ae259f132e8a557001f54d58037f2534753.tar.gz
Merge branch 'docs/pipelines-gitaly-version-removal' into 'master'
Remove Gitaly version in the docs See merge request gitlab-org/gitlab-ce!32006
Diffstat (limited to 'doc')
-rw-r--r--doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md5
1 files changed, 2 insertions, 3 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 ad07c662965..126e12e460f 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
@@ -35,10 +35,9 @@ get out of WIP status or resolve merge conflicts as soon as possible.
## Requirements and limitations
-Pipelines for merged results require:
+Pipelines for merged results require a [GitLab Runner][runner] 11.9 or newer.
-- [GitLab Runner](https://gitlab.com/gitlab-org/gitlab-runner) 11.9 or newer.
-- [Gitaly](https://gitlab.com/gitlab-org/gitaly) 1.21.0 or newer.
+[runner]: https://gitlab.com/gitlab-org/gitlab-runner
In addition, pipelines for merged results have the following limitations: