diff options
| author | Evan Read <eread@gitlab.com> | 2019-09-02 06:43:47 +0000 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2019-09-02 06:43:47 +0000 |
| commit | 516ce472ef425f6974abac3bff14dfe4ac6501ec (patch) | |
| tree | dd5380dcfa9ab59c393342d966b911b7c83a5f90 /doc | |
| parent | effd7e72e3499328ae64746d5be1227fd4c8a561 (diff) | |
| parent | a560727ed22666c0bfb2eb4b1db5c59f53b17bf9 (diff) | |
| download | gitlab-ce-516ce472ef425f6974abac3bff14dfe4ac6501ec.tar.gz | |
Merge branch 'typo-ci-reference' into 'master'
Fix typo in GitLab CI configuration reference
See merge request gitlab-org/gitlab-ce!32382
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ci/yaml/README.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index 10255f768e6..06bd9e68a18 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -100,7 +100,7 @@ The following table lists available parameters for jobs: | [`stage`](#stage) | Defines a job stage (default: `test`). | | [`only`](#onlyexcept-basic) | Limit when jobs are created. Also available: [`only:refs`, `only:kubernetes`, `only:variables`, and `only:changes`](#onlyexcept-advanced). | | [`except`](#onlyexcept-basic) | Limit when jobs are not created. Also available: [`except:refs`, `except:kubernetes`, `except:variables`, and `except:changes`](#onlyexcept-advanced). | -| [`rules`](#rules) | List of coniditions to evaluate and determine selected attributes of a build and whether or not it is created. May not be used alongside `only`/`except`. +| [`rules`](#rules) | List of conditions to evaluate and determine selected attributes of a build and whether or not it is created. May not be used alongside `only`/`except`. | [`tags`](#tags) | List of tags which are used to select Runner. | | [`allow_failure`](#allow_failure) | Allow job to fail. Failed job doesn't contribute to commit status. | | [`when`](#when) | When to run job. Also available: `when:manual` and `when:delayed`. | |