diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-06 13:47:23 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-06 13:47:23 +0000 |
| commit | 35083dc9e799cafb74614f04fafd5e6b5350fd21 (patch) | |
| tree | 5a5ca4d1f2c91dc93d261b26404389c7b041a5f9 | |
| parent | 4ab1e07fd3fef373a83137ca851558b0f327bfd5 (diff) | |
| parent | c4878a762fe9cc90022277e5f559fa0c169e09e0 (diff) | |
| download | gitlab-ce-35083dc9e799cafb74614f04fafd5e6b5350fd21.tar.gz | |
Merge branch 'fix_explanation_of_job_level_variable_override' into 'master'
Update explanation of job-level variable override to fit example
See merge request !11923
| -rw-r--r-- | doc/ci/variables/README.md | 2 | ||||
| -rw-r--r-- | doc/ci/yaml/README.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md index 56ff245f9f9..23c93c59604 100644 --- a/doc/ci/variables/README.md +++ b/doc/ci/variables/README.md @@ -120,7 +120,7 @@ The YAML-defined variables are also set to all created tune them. Variables can be defined at a global level, but also at a job level. To turn off -global defined variables in your job, define an empty array: +global defined variables in your job, define an empty hash: ```yaml job_name: diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index 2c9aa437932..dd4b589d37c 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -434,7 +434,7 @@ but allows you to define job-specific variables. When the `variables` keyword is used on a job level, it overrides the global YAML job variables and predefined ones. To turn off global defined variables -in your job, define an empty array: +in your job, define an empty hash: ```yaml job_name: |