summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-08-20 17:55:33 +0000
committerGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2019-08-23 10:08:35 +0000
commit0aed49db1ef9b2df99cf1b1602a33a473d741cc3 (patch)
tree756c7182a8e2bcf5b236fe35fe43b154021063c4
parentbdc80896ac8e876859abc4dc3e6d6966af3fc006 (diff)
downloadgitlab-ce-0aed49db1ef9b2df99cf1b1602a33a473d741cc3.tar.gz
Merge branch 'docs/clarify-new-values' into 'master'
Clarify when new values are valid See merge request gitlab-org/gitlab-ce!31951 (cherry picked from commit 47c069ccba568f407ec605ea033adfc48fe5943b) 1efa52be Clarify when new values are valid
-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)