diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-06-01 16:39:24 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-06-01 16:43:07 +0800 |
| commit | fb70cf077cbc3b4fe07fad930be67331d2e57817 (patch) | |
| tree | c8f25c9079fcffcf6fa6b10f8c3fe6eae9d8b97c | |
| parent | 3cc138d824df039af2d7dae2ae04c30e98b51af1 (diff) | |
| download | gitlab-ce-fb70cf077cbc3b4fe07fad930be67331d2e57817.tar.gz | |
Merge two items into one in the doc
| -rw-r--r-- | doc/ci/variables/README.md | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md index 71f2088be74..0a031578a18 100644 --- a/doc/ci/variables/README.md +++ b/doc/ci/variables/README.md @@ -10,8 +10,7 @@ The variables can be overwritten and they take precedence over each other in this order: 1. [Trigger variables][triggers] (take precedence over all) -1. [Secret variables](#secret-variables) -1. [Protected secret variables](#protected-secret-variables) +1. [Secret variables](#secret-variables) or [protected secret variables](#protected-secret-variables) 1. YAML-defined [job-level variables](../yaml/README.md#job-variables) 1. YAML-defined [global variables](../yaml/README.md#variables) 1. [Deployment variables](#deployment-variables) |