diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index 7be00f0bfc819f93f14e8cf6c0ba29532f70325b..056e52843e7a6d5ff7fdd94fc69a0af03730fdad 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 6907fad8e8a119b4ae691621b2bbe4407728a27b..8e8c979f973d248a34d3c5fca635eaf7d09b8e14 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