summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Atkins <tatkins@gitlab.com>2019-08-01 11:29:45 +0000
committerTom Atkins <tatkins@gitlab.com>2019-08-01 11:29:45 +0000
commitc36b12d7f12ed830662a8169cef3e880bd788f3b (patch)
treeed6cc18bdf04986633d9cb3d7e98e3bc68578709
parent0149ebccaba8ee1bae583ccc48947e317319c6e4 (diff)
parentcb76850037de23f24bab39886397040769f35aeb (diff)
downloadgitlab-ce-c36b12d7f12ed830662a8169cef3e880bd788f3b.tar.gz
Merge branch 'ticket_126158_vlad' into 'master'
Portray better use of types of variables in .gitlab-ci.yml See merge request gitlab-org/gitlab-ce!31232
-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 4d6ca8cff6d..c48817a5e30 100644
--- a/doc/ci/variables/README.md
+++ b/doc/ci/variables/README.md
@@ -370,8 +370,11 @@ variables take precedence over those defined in `.gitlab-ci.yml`.
## Unsupported variables
There are cases where some variables cannot be used in the context of a
-`.gitlab-ci.yml` definition (for example under `script`). Read more
-about which variables are [not supported](where_variables_can_be_used.md).
+`.gitlab-ci.yml` definition (for example under `script`). Read more about which variables are [not supported](where_variables_can_be_used.md).
+
+## Where variables can be used
+
+Click [here](where_variables_can_be_used.md) for a section that describes where and how the different types of variables can be used.
## Advanced use