summaryrefslogtreecommitdiff
path: root/doc/ci/yaml/README.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-09 03:09:28 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-09 03:09:28 +0000
commitcfd62c3a3ebbc85f5787c103bfa6de1997ab8e11 (patch)
treeb58e9f69932001493b95751f593c237b4d222e10 /doc/ci/yaml/README.md
parent545bf30c7ca74d5252cdbadc6437cd494b10ed6a (diff)
downloadgitlab-ce-cfd62c3a3ebbc85f5787c103bfa6de1997ab8e11.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/yaml/README.md')
-rw-r--r--doc/ci/yaml/README.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 558ae5e20d3..707b14cda95 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -3588,8 +3588,8 @@ Floats are not legal and cannot be used.
GitLab CI/CD allows you to define variables inside `.gitlab-ci.yml` that are
then passed in the job environment. They can be set globally and per-job.
-When the `variables` keyword is used on a job level, it overrides the global
-YAML variables and predefined ones.
+When the `variables` keyword is used on a job level, it will override the global
+YAML variables and predefined ones of the same name.
They are stored in the Git repository and are meant to store non-sensitive
project configuration, for example: