summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-09-18 20:31:00 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-09-19 10:07:15 +0200
commit223041fa1bba534d613489f41d6143f1785fd0b4 (patch)
treeafacefd32c0ac7f7f8807ee51f36ed114b0f7474 /doc
parent99f1385ee02a368e8fa7cc0bcaad78b904d1a81d (diff)
downloadgitlab-ce-223041fa1bba534d613489f41d6143f1785fd0b4.tar.gz
Fix environments handling
Diffstat (limited to 'doc')
-rw-r--r--doc/ci/yaml/README.md3
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index f65340f190e..16868554c1f 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -547,7 +547,7 @@ GitLab.
If `environment` is specified and no environment under that name exists, a new
one will be created automatically.
-The `environment` name must be a valid [Git reference name][gitref]. Common
+The `environment` name must contain only letters, digits, '-', '_', '/', '$', '{', '}' and spaces. Common
names are `qa`, `staging`, and `production`, but you can use whatever name works
with your workflow.
@@ -1083,5 +1083,4 @@ CI with various languages.
[examples]: ../examples/README.md
[ce-6323]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6323
-[gitref]: https://git-scm.com/docs/git-check-ref-format
[environment]: ../environments.md