summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-07-21 09:32:41 +0300
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-07-21 09:35:44 +0300
commitd0341bc3ee682a2ef6a4818309b349c1ac7e153e (patch)
tree55cc7f572570ee41d8176072d0e54c18447ce70f /doc
parentfa8d3ac8110da24c5c907a5daf2e3fa46bf6331f (diff)
downloadgitlab-ce-d0341bc3ee682a2ef6a4818309b349c1ac7e153e.tar.gz
Mention manual actions section in when clause docsmanual-action-grammar
Diffstat (limited to 'doc')
-rw-r--r--doc/ci/yaml/README.md10
1 files changed, 6 insertions, 4 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index d84f3b7d263..ecca469e4b8 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -485,7 +485,8 @@ failure.
1. `on_failure` - execute build only when at least one build from prior stages
fails.
1. `always` - execute build regardless of the status of builds from prior stages.
-1. `manual` - execute build manually.
+1. `manual` - execute build manually (added in GitLab 8.10). Read about
+ [manual actions](#manual-actions) below.
For example:
@@ -528,9 +529,10 @@ cleanup_job:
The above script will:
-1. Execute `cleanup_build_job` only when `build_job` fails
-2. Always execute `cleanup_job` as the last step in pipeline
-3. Allow you to manually execute `deploy_job` from GitLab
+1. Execute `cleanup_build_job` only when `build_job` fails.
+2. Always execute `cleanup_job` as the last step in pipeline regardless of
+ success or failure.
+3. Allow you to manually execute `deploy_job` from GitLab's UI.
#### Manual actions