diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-03-19 08:27:05 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-21 12:28:43 +0100 |
| commit | dd2b4d7bc5cd5aa770bed08c5ffb79784e6e3fe0 (patch) | |
| tree | 19f3044febf312d5a602623b3cb7034d0955ce00 | |
| parent | 1793a65eeb2f75dd28c8f243e0b8acc0e7b0366b (diff) | |
| download | gitlab-ce-dd2b4d7bc5cd5aa770bed08c5ffb79784e6e3fe0.tar.gz | |
Merge branch 'master' into 'master'
Add information about `image` and `services` field at `job` level in the `.gitlab-ci.yml` documentation
Fixes #14366
/cc @tmaczukin @ayufan @axil
See merge request !3277
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | doc/ci/yaml/README.md | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index ca360c6706d..09de37c54b4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -15,6 +15,7 @@ v 8.6.0 (unreleased) - Add support for wiki with UTF-8 page names (Hiroyuki Sato) - Fix wiki search results point to raw source (Hiroyuki Sato) - Don't load all of GitLab in mail_room + - Add information about `image` and `services` field at `job` level in the `.gitlab-ci.yml` documentation (Pat Turner) - HTTP error pages work independently from location and config (Artem Sidorenko) - Update `omniauth-saml` to 1.5.0 to allow for custom response attributes to be set - Memoize @group in Admin::GroupsController (Yatish Mehta) diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index a9b79bbdb1b..762b35859b9 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -279,6 +279,8 @@ job_name: | Keyword | Required | Description | |---------------|----------|-------------| | script | yes | Defines a shell script which is executed by runner | +| image | no | Use docker image, covered in [Using Docker Images](../docker/using_docker_images.md#define-image-and-services-from-gitlab-ciyml) | +| services | no | Use docker services, covered in [Using Docker Images](../docker/using_docker_images.md#define-image-and-services-from-gitlab-ciyml) | | stage | no | Defines a build stage (default: `test`) | | type | no | Alias for `stage` | | only | no | Defines a list of git refs for which build is created | |