diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-27 03:06:19 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-27 03:06:19 +0000 |
| commit | 91f027ede40879af0bce406f2872e8d35c01e334 (patch) | |
| tree | a3e6b49e140694c95a7a30370c662c3bdd224227 /doc/ci | |
| parent | bd8a202da68db8c61150d52e246997f04c329110 (diff) | |
| download | gitlab-ce-91f027ede40879af0bce406f2872e8d35c01e334.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci')
| -rw-r--r-- | doc/ci/yaml/README.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index ce3d6247d86..fb9dd7792c3 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -275,13 +275,13 @@ For more information, see see [Available settings for `services`](../docker/usin `before_script` is used to define a command that should be run before each job, including deploy jobs, but after the restoration of any [artifacts](#artifacts). -This must be an an array. +This must be an array. Scripts specified in `before_script` are concatenated with any scripts specified in the main [`script`](#script), and executed together in a single shell. `after_script` is used to define the command that will be run after each -job, including failed ones. This must be an an array. +job, including failed ones. This must be an array. Scripts specified in `after_script` are executed in a new shell, separate from any `before_script` or `script` scripts. As a result, they: |