summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-07-17 08:44:35 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-07-17 08:44:35 +0000
commit7a7ecbeacdb928cd53aa6ce61c7a569c928e4666 (patch)
treec0875205591f65358ffcef2f04f8f11ced9cdfc1
parent2550c1c2bc70beb14293eebb243a2f6f3039d04b (diff)
parent63e951797102b37ef99a5651e18c45dc24e7f75c (diff)
downloadgitlab-ce-7a7ecbeacdb928cd53aa6ce61c7a569c928e4666.tar.gz
Merge branch 'doc-ci-anchor-yaml-fix' into 'master'
Fix CI yaml example ## What does this MR do? Fixes a typo in a CI yaml example. ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19888 See merge request !5304
-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 16a1461a7e4..50fa263f693 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -985,11 +985,11 @@ directive defined in `.postgres_services` and `.mysql_services` respectively:
- ruby
test:postgres:
- << *job_definition
+ <<: *job_definition
services: *postgres_definition
test:mysql:
- << *job_definition
+ <<: *job_definition
services: *mysql_definition
```