diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 18:09:10 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 18:09:10 +0300 |
| commit | 8e129497b2565b8c595ef4f806d9a9595ca654e5 (patch) | |
| tree | 7afeeca3ea58013c1e8c3a2055661bacf65577da /doc/ci | |
| parent | 8ae26d705abe341b03bc15d4373d6cd0c77c0baf (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci')
| -rw-r--r-- | doc/ci/docker/using_docker_images.md | 2 | ||||
| -rw-r--r-- | doc/ci/yaml/README.md | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/ci/docker/using_docker_images.md b/doc/ci/docker/using_docker_images.md index 32faa128e6b..3316113d776 100644 --- a/doc/ci/docker/using_docker_images.md +++ b/doc/ci/docker/using_docker_images.md @@ -489,7 +489,7 @@ Look for the `[runners.docker]` section: ```toml [runners.docker] - image = "ruby:2.1" + image = "ruby:latest" services = ["mysql:latest", "postgres:latest"] ``` diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index 21eca42d8e7..50667a402f2 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -460,6 +460,9 @@ For example, the following are equivalent configuration: - b ``` +NOTE: **Note:** +A pipeline will not be created if it only contains jobs in `.pre` or `.post` stages. + ### `stage` `stage` is defined per-job and relies on [`stages`](#stages) which is defined |