diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-09-05 14:55:27 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-09-05 14:55:27 +0200 |
| commit | e8648241e4af7d5f9ae1345fef9636bfdbb85557 (patch) | |
| tree | 49a94c56b347b69e1c98438285ebfa2bc8dcd54a /doc/ci | |
| parent | 2e73c248c9f75e63068dfa84adaced4eefbb7297 (diff) | |
| download | gitlab-ce-e8648241e4af7d5f9ae1345fef9636bfdbb85557.tar.gz | |
Fix extended CI/CD configuration docs for `extends`
Diffstat (limited to 'doc/ci')
| -rw-r--r-- | doc/ci/yaml/README.md | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index fa8a083c7a8..c1ebe39e076 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -90,7 +90,6 @@ more flexible and readable. .tests: only: refs: - - master - branches rspec: @@ -113,7 +112,6 @@ rspec: stage: test only: refs: - - master - branches variables: - $RSPEC @@ -130,22 +128,20 @@ use more than three levels of inheritance. Maximum nesting level supported is ```yaml .tests: only: - refs: - - master - - branches + - pushes .rspec: extends: .tests script: rake rspec rspec 1: - variables - RSPEC_SUITE: 1 + variables: + RSPEC_SUITE: '1' extends: .rspec rspec 2: - variables - RSPEC_SUITE: 2 + variables: + RSPEC_SUITE: '2' extends: .rspec spinach: |