diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /lib/gitlab/ci/config/entry/processable.rb | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'lib/gitlab/ci/config/entry/processable.rb')
-rw-r--r-- | lib/gitlab/ci/config/entry/processable.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/gitlab/ci/config/entry/processable.rb b/lib/gitlab/ci/config/entry/processable.rb index c0315e5f901..5ef8cfbddb7 100644 --- a/lib/gitlab/ci/config/entry/processable.rb +++ b/lib/gitlab/ci/config/entry/processable.rb @@ -32,7 +32,6 @@ module Gitlab with_options allow_nil: true do validates :extends, array_of_strings_or_string: true validates :rules, array_of_hashes: true - validates :allow_failure, boolean: true end end @@ -65,7 +64,7 @@ module Gitlab inherit: false, default: {} - attributes :extends, :rules, :allow_failure + attributes :extends, :rules end def compose!(deps = nil) @@ -141,10 +140,6 @@ module Gitlab def manual_action? self.when == 'manual' end - - def ignored? - allow_failure.nil? ? manual_action? : allow_failure - end end end end |