diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-22 18:10:04 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-22 18:10:04 +0300 |
commit | 632d0734750382e7c4e5f1b3c526a94acf6e7ce2 (patch) | |
tree | 7f212ce25ff1d0d4ea03f48ad6dedb09c9ad09eb /lib/gitlab/ci/build/rules.rb | |
parent | 74b99c4264411703dedaf2d24cec2e6a5de6337d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/ci/build/rules.rb')
-rw-r--r-- | lib/gitlab/ci/build/rules.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/ci/build/rules.rb b/lib/gitlab/ci/build/rules.rb index 2d4f9cf635b..dee95534b07 100644 --- a/lib/gitlab/ci/build/rules.rb +++ b/lib/gitlab/ci/build/rules.rb @@ -6,7 +6,7 @@ module Gitlab class Rules include ::Gitlab::Utils::StrongMemoize - Result = Struct.new(:when, :start_in, :allow_failure, :variables) do + Result = Struct.new(:when, :start_in, :allow_failure, :variables, :errors) do def build_attributes { when: self.when, @@ -38,6 +38,8 @@ module Gitlab else Result.new('never') end + rescue Rule::Clause::ParseError => e + Result.new('never', nil, nil, nil, [e.message]) end private |