summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-01-15 08:34:03 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-01-15 08:34:03 +0000
commit923d087b3e2938877273017554a38bc3ee640bf4 (patch)
tree07155079c3e0aaa4dc643df4f2d174821bdcfb8f
parent6277ef8e285b203bbe5db3893af2a84b537fc454 (diff)
parent0f16e34c2a2031c172ad9d1a257c8a2f0146fb8a (diff)
downloadgitlab-ce-923d087b3e2938877273017554a38bc3ee640bf4.tar.gz
Merge branch 'patch-28' into 'master'
Improve after_script docs in yaml/README.md See merge request gitlab-org/gitlab-ce!16444
-rw-r--r--doc/ci/yaml/README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 32464cbb259..ae0b5c0a2ba 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -93,7 +93,7 @@ be an array or a multi-line string.
> Introduced in GitLab 8.7 and requires Gitlab Runner v1.2
`after_script` is used to define the command that will be run after for all
-jobs. This has to be an array or a multi-line string.
+jobs, including failed ones. This has to be an array or a multi-line string.
> **Note:**
The `before_script` and the main `script` are concatenated and run in a single context/container.