diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-03-07 16:43:52 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-03-07 16:43:52 +0000 |
| commit | f1073689b5d421c8f610b2f16994dd8af1f61d83 (patch) | |
| tree | aa07b52d005121ce4cd4a13708434cee8dd8ccff | |
| parent | de37dcee90ac44ba794ad504e91f18b8fb4b13a3 (diff) | |
| parent | 6bd85c1bd426c9cd58065e7ce2117f78334533b6 (diff) | |
| download | gitlab-ce-f1073689b5d421c8f610b2f16994dd8af1f61d83.tar.gz | |
Merge branch 'fix/gb/deprecate-ci-config-types' into 'master'
Deprecate usage of `types` CI/CD configuration entry
See merge request !9766
| -rw-r--r-- | changelogs/unreleased/fix-gb-deprecate-ci-config-types.yml | 4 | ||||
| -rw-r--r-- | doc/ci/yaml/README.md | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changelogs/unreleased/fix-gb-deprecate-ci-config-types.yml b/changelogs/unreleased/fix-gb-deprecate-ci-config-types.yml new file mode 100644 index 00000000000..605b5f01d0e --- /dev/null +++ b/changelogs/unreleased/fix-gb-deprecate-ci-config-types.yml @@ -0,0 +1,4 @@ +--- +title: Deprecate usage of `types` configuration entry to describe CI/CD stages +merge_request: 9766 +author: diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index b25ccd4376e..49fa8761e5e 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -70,7 +70,7 @@ There are a few reserved `keywords` that **cannot** be used as job names: | image | no | Use docker image, covered in [Use Docker](../docker/README.md) | | services | no | Use docker services, covered in [Use Docker](../docker/README.md) | | stages | no | Define build stages | -| types | no | Alias for `stages` | +| types | no | Alias for `stages` (deprecated) | | before_script | no | Define commands that run before each job's script | | after_script | no | Define commands that run after each job's script | | variables | no | Define build variables | @@ -130,6 +130,8 @@ There are also two edge cases worth mentioning: ### types +> Deprecated, and will be removed in 10.0. Use [stages](#stages) instead. + Alias for [stages](#stages). ### variables |