summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-03-02 09:50:19 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-03-02 09:50:19 +0000
commitef74c5f5a1cee18cac1e69afaf0a472b64a5a656 (patch)
tree86ca04eefe6a26188fc10b88b1891dea219d9f54 /doc
parentf29dbaf55cc0c8a4b80c153454a2f7e22fd7a827 (diff)
parent91e6a672848f1b88e061d2fee9170ca7bd7f812e (diff)
downloadgitlab-ce-ef74c5f5a1cee18cac1e69afaf0a472b64a5a656.tar.gz
Merge branch 'zj-version-string-grouping-ci' into 'master'
Allow CI/CD Jobs being grouped on version strings See merge request gitlab-org/gitlab-ce!17455
Diffstat (limited to 'doc')
-rw-r--r--doc/ci/pipelines.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/ci/pipelines.md b/doc/ci/pipelines.md
index ac4a9b0ed27..856d7f264e4 100644
--- a/doc/ci/pipelines.md
+++ b/doc/ci/pipelines.md
@@ -121,8 +121,9 @@ The basic requirements is that there are two numbers separated with one of
the following (you can even use them interchangeably):
- a space
-- a backslash (`/`)
+- a forward slash (`/`)
- a colon (`:`)
+- a dot (`.`)
>**Note:**
More specifically, [it uses][regexp] this regular expression: `\d+[\s:\/\\]+\d+\s*`.