diff options
| author | Mark Pundsack <markpundsack@users.noreply.github.com> | 2016-06-14 17:58:20 -0700 |
|---|---|---|
| committer | Mark Pundsack <markpundsack@users.noreply.github.com> | 2016-06-20 14:25:45 -0700 |
| commit | a0fefc2ad22ed2392bcba5acb02a0a95b73cbba8 (patch) | |
| tree | 161b8c77b85fe054263c79a71599e2e3d877fe10 /doc/ci/yaml/README.md | |
| parent | 032e398374b40d5b68c4a1ce89dd698f1d03a54c (diff) | |
| download | gitlab-ce-a0fefc2ad22ed2392bcba5acb02a0a95b73cbba8.tar.gz | |
Add definitions and tweak some docs. Partially fixes #17733
Diffstat (limited to 'doc/ci/yaml/README.md')
| -rw-r--r-- | doc/ci/yaml/README.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index d0fbcbe9988..b134b5cd5d3 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -54,7 +54,7 @@ of your repository and contains definitions of how your project should be built. The YAML file defines a set of jobs with constraints stating when they should be run. The jobs are defined as top-level elements with a name and always have -to contain the `script` clause: +to contain at least the `script` clause: ```yaml job1: @@ -165,7 +165,7 @@ stages: There are also two edge cases worth mentioning: -1. If no `stages` is defined in `.gitlab-ci.yml`, then by default the `build`, +1. If no `stages` are defined in `.gitlab-ci.yml`, then by default the `build`, `test` and `deploy` are allowed to be used as job's stage by default. 2. If a job doesn't specify a `stage`, the job is assigned the `test` stage. |