summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2019-08-20 14:03:38 +0200
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2019-08-20 14:03:38 +0200
commit505dfe5939f4faf4d297e939aa84771f17eaae33 (patch)
treeab5666633e86842d6448fc66ef4d8e05fccc95a4
parent51c19691e4c4ceb60ef28fd08c6b13549a423a39 (diff)
downloadgitlab-ce-docs/pipelines-gitaly-version-removal.tar.gz
Remove Gitaly version in the docsdocs/pipelines-gitaly-version-removal
It's very hard for end user to know what version of Gitaly is running, and they should not have to care about this detail either. Gitaly 1.21.0 was released before 11.9 was tagged, so it's an unsupported version too. This change removes the reference.
-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: