diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-01-11 18:17:47 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-01-11 18:17:47 +0300 |
| commit | 740871eef86d9b3b72de3e36cd07e1c9c532685f (patch) | |
| tree | 0928a33ce11387e57cae245628370ea0740ea19b | |
| parent | 54c109879bff20c2a9f921d4e79187e1d03ed6b4 (diff) | |
| parent | ab4d40ea62367d595620d0e06de47fdb6f1e60b8 (diff) | |
Merge branch '56172/docs-fix-add-include-to-ci-param-list' into 'master'
Update CI YAML parameter table w/ 'include'
Closes #56172
See merge request gitlab-org/gitlab-ce!24309
| -rw-r--r-- | changelogs/unreleased/56172-docs-fix-add-include-to-ci-param-list.yml | 5 | ||||
| -rw-r--r-- | doc/ci/yaml/README.md | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changelogs/unreleased/56172-docs-fix-add-include-to-ci-param-list.yml b/changelogs/unreleased/56172-docs-fix-add-include-to-ci-param-list.yml new file mode 100644 index 00000000000..92592290ac4 --- /dev/null +++ b/changelogs/unreleased/56172-docs-fix-add-include-to-ci-param-list.yml @@ -0,0 +1,5 @@ +--- +title: Update CI YAML param table with include +merge_request: !24309 +author: +type: fixed diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index efee2852eb8..d4f0da52e53 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -57,6 +57,7 @@ A job is defined by a list of parameters that define the job behavior. |---------------|----------|-------------| | [script](#script) | yes | Defines a shell script which is executed by Runner | | [extends](#extends) | no | Defines a configuration entry that this job is going to inherit from | +| [include](#include) | no | Defines a configuration entry that allows this job to include external YAML files | | [image](#image-and-services) | no | Use docker image, covered in [Using Docker Images](../docker/using_docker_images.md#define-image-and-services-from-gitlab-ciyml) | | [services](#image-and-services) | no | Use docker services, covered in [Using Docker Images](../docker/using_docker_images.md#define-image-and-services-from-gitlab-ciyml) | | [stage](#stage) | no | Defines a job stage (default: `test`) | |