diff options
| author | Markus Doits <markus.doits@stellenticket.de> | 2018-10-19 16:54:29 +0200 |
|---|---|---|
| committer | Markus Doits <markus.doits@stellenticket.de> | 2018-11-07 13:05:13 +0100 |
| commit | 63aa35cb206d265faeebfaf2cc71156c69077ce8 (patch) | |
| tree | 2252200f45351d53bc0482b4e80efe2ba6d0cce1 | |
| parent | 9818bb561889579ed1031e90b7879ec1c3f0e25a (diff) | |
| download | gitlab-ce-63aa35cb206d265faeebfaf2cc71156c69077ce8.tar.gz | |
small fixes to doc and remove on whitespace noise
| -rw-r--r-- | doc/ci/yaml/README.md | 2 | ||||
| -rw-r--r-- | lib/gitlab/ci/config/entry/job.rb | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index 7be00f0bfc8..056e52843e7 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -1433,7 +1433,7 @@ job1: ## `retry` > [Introduced][ce-12909] in GitLab 9.5. -> [Behaviour expanded][ce-21758] in GitLab 11.4 to control on which failures to retry. +> [Behaviour expanded][ce-21758] in GitLab 11.5 to control on which failures to retry. `retry` allows you to configure how many times a job is going to be retried in case of a failure. diff --git a/lib/gitlab/ci/config/entry/job.rb b/lib/gitlab/ci/config/entry/job.rb index 6907fad8e8a..8e8c979f973 100644 --- a/lib/gitlab/ci/config/entry/job.rb +++ b/lib/gitlab/ci/config/entry/job.rb @@ -28,12 +28,10 @@ module Gitlab validates :allow_failure, boolean: true validates :parallel, numericality: { only_integer: true, greater_than_or_equal_to: 2 } - validates :when, inclusion: { in: %w[on_success on_failure always manual delayed], message: 'should be on_success, on_failure, ' \ 'always, manual or delayed' } - validates :dependencies, array_of_strings: true validates :extends, type: String end |