summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-08-26 18:47:20 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-08-26 18:47:20 +0000
commitaf3cc3837856e86815cb1d774b831fa7abaa8795 (patch)
tree022c5fa10e877c38189f6abe08cbd13a729e3044
parentdf961f5babcdfadeac3fd9340c48ef81d8682fd6 (diff)
parent40884010ad48c83a91ece50c17eaa78f3c7c9a6c (diff)
downloadgitlab-ce-af3cc3837856e86815cb1d774b831fa7abaa8795.tar.gz
Merge branch 'patch-5' into 'master'
Update pipelines.md ## What does this MR do? attempt to solve: https://gitlab.com/gitlab-org/gitlab-ce/commit/a03cadcdbf3024ec59234a07a9b87884de5cc7dc#note_14172234 the word isn't visible anyway, don't know what original author intended to say. at least it fixes the `stages` link now. ## Does this MR meet the acceptance criteria? - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) See merge request !6040
-rw-r--r--doc/ci/pipelines.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ci/pipelines.md b/doc/ci/pipelines.md
index 20cd88c8d20..ca9b986a060 100644
--- a/doc/ci/pipelines.md
+++ b/doc/ci/pipelines.md
@@ -5,7 +5,7 @@ Introduced in GitLab 8.8.
## Pipelines
-A pipeline is a group of [builds] that get executed in [stages] (batches). All
+A pipeline is a group of [builds] that get executed in [stages] \(batches). All
of the builds in a stage are executed in parallel (if there are enough
concurrent [runners]), and if they all succeed, the pipeline moves on to the
next stage. If one of the builds fails, the next stage is not (usually)