summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Pundsack <markpundsack@users.noreply.github.com>2016-07-20 19:13:36 -0700
committerMark Pundsack <markpundsack@users.noreply.github.com>2016-07-20 19:13:36 -0700
commit335757ba3b6610809fe1939de710dddf9cfe2d7a (patch)
treed9358c176196cf79d2b6b1413f9af672fb02f15a
parentb5ef5cc6acd0a583a68ee606ae6005a1f6d16df3 (diff)
downloadgitlab-ce-fix-when.tar.gz
Add when:manual to docfix-when
-rw-r--r--doc/ci/yaml/README.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 31b4fd2669e..14bf672bda2 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -351,7 +351,7 @@ job_name:
| except | no | Defines a list of git refs for which build is not created |
| tags | no | Defines a list of tags which are used to select Runner |
| allow_failure | no | Allow build to fail. Failed build doesn't contribute to commit status |
-| when | no | Define when to run build. Can be `on_success`, `on_failure` or `always` |
+| when | no | Define when to run build. Can be `on_success`, `on_failure`, `always`, or `manual` |
| dependencies | no | Define other builds that a build depends on so that you can pass artifacts between them|
| artifacts | no | Define list of build artifacts |
| cache | no | Define list of files that should be cached between subsequent runs |
@@ -538,7 +538,7 @@ The above script will:
Introduced in GitLab 8.10.
Manual actions are special type of jobs that are not executed automatically in pipeline.
-They need to be explicitly started by the user.
+They need to be explicitly started by the user.
Manual actions can be started from pipelines, builds, environments and deployments views.
You can execute the same manual action multiple times.