summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-08-20 17:55:33 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2019-08-20 17:55:33 +0000
commit47c069ccba568f407ec605ea033adfc48fe5943b (patch)
treeb83e58867d6a81858d8ee7fb18145be31544f9c2
parent0966c99586f5c1b61ea952aaf8370628d2025ba6 (diff)
parentb4a0e14cb7798b76d14bf6d2a540a4dd586bb154 (diff)
downloadgitlab-ce-47c069ccba568f407ec605ea033adfc48fe5943b.tar.gz
Merge branch 'docs/clarify-new-values' into 'master'
Clarify when new values are valid See merge request gitlab-org/gitlab-ce!31951
-rw-r--r--doc/ci/variables/README.md7
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md
index d741482b662..5a15b907da0 100644
--- a/doc/ci/variables/README.md
+++ b/doc/ci/variables/README.md
@@ -94,7 +94,10 @@ This means that the value of the variable will be hidden in job logs,
though it must match certain requirements to do so:
- The value must be in a single line.
-- The value must only consist of characters from the Base64 alphabet ([RFC4648](https://tools.ietf.org/html/rfc4648)) with the addition of `@` and `:`.
+- The value must only consist of characters from the Base64 alphabet (RFC4648).
+
+ [In GitLab 12.2](https://gitlab.com/gitlab-org/gitlab-ce/issues/63043)
+ and newer, `@` and `:` are also valid values.
- The value must be at least 8 characters long.
- The value must not use variables.
@@ -509,7 +512,7 @@ Below you can find supported syntax reference:
1. Checking for an empty variable
Examples:
-
+
- `$VARIABLE == ""`
- `$VARIABLE != ""` (introduced in GitLab 11.11)