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/bridge.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/bridge.rb')
-rw-r--r-- | lib/gitlab/ci/config/entry/bridge.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/gitlab/ci/config/entry/bridge.rb b/lib/gitlab/ci/config/entry/bridge.rb index 70fcc1d586a..e8e2eef281e 100644 --- a/lib/gitlab/ci/config/entry/bridge.rb +++ b/lib/gitlab/ci/config/entry/bridge.rb @@ -22,6 +22,7 @@ module Gitlab in: ALLOWED_WHEN, message: "should be one of: #{ALLOWED_WHEN.join(', ')}" } + validates :allow_failure, boolean: true end validate on: :composed do @@ -47,7 +48,7 @@ module Gitlab inherit: false, metadata: { allowed_needs: %i[job bridge] } - attributes :when + attributes :when, :allow_failure def self.matching?(name, config) !name.to_s.start_with?('.') && @@ -72,6 +73,10 @@ module Gitlab def bridge_needs needs_value[:bridge] if needs_value end + + def ignored? + allow_failure.nil? ? manual_action? : allow_failure + end end end end |