diff options
author | Ash McKenzie <amckenzie@gitlab.com> | 2019-09-09 11:04:52 +0000 |
---|---|---|
committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-09-09 11:04:52 +0000 |
commit | 7cc631d2519519ad6d0d549d4ededcce2cd3c764 (patch) | |
tree | 2225f395349e7a264f0fc8ee393c70213c1ffc0f /doc | |
parent | 60231c270713ea78a4bfe6a722064abebf589d4d (diff) | |
parent | 6bafb3c129dc1cf40dcc389a2ce44db37bd1d515 (diff) | |
download | gitlab-ce-7cc631d2519519ad6d0d549d4ededcce2cd3c764.tar.gz |
Merge branch 'fix-doc-interruptible-env-default' into 'master'
Fixes interruptible property documentation
See merge request gitlab-org/gitlab-ce!32758
Diffstat (limited to 'doc')
-rw-r--r-- | doc/ci/yaml/README.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index 8f2e95dbb10..8aae0e85c89 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -2086,7 +2086,9 @@ staging: ### `interruptible` -`interruptible` is used to indicate that a job should be canceled if made redundant by a newer run of the same job. Defaults to `false` if there is an environment defined and `true` otherwise. +> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23464) in GitLab 12.3. + +`interruptible` is used to indicate that a job should be canceled if made redundant by a newer run of the same job. Defaults to `true`. This value will only be used if the [automatic cancellation of redundant pipelines feature](https://docs.gitlab.com/ee/user/project/pipelines/settings.html#auto-cancel-pending-pipelines) is enabled. |