diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-03-27 15:46:58 +0300 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-03-27 15:46:58 +0300 |
commit | 937630bb8eb0d85bf02655df29e954d32ce7e26b (patch) | |
tree | bd72c52f36945da66d8c3214922072f634169c7a /lib/gitlab/ci | |
parent | a745eadffb89abf74f5df0ccd57ec3c36ee054b9 (diff) |
Do not raise when validating variables expression
Diffstat (limited to 'lib/gitlab/ci')
-rw-r--r-- | lib/gitlab/ci/config/entry/policy.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/ci/pipeline/expression/statement.rb | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/lib/gitlab/ci/config/entry/policy.rb b/lib/gitlab/ci/config/entry/policy.rb index b6d137a7e68..09e8e52b60f 100644 --- a/lib/gitlab/ci/config/entry/policy.rb +++ b/lib/gitlab/ci/config/entry/policy.rb @@ -47,7 +47,7 @@ module Gitlab statements.each do |statement| unless statement.valid? - errors.add(:variables, "Invalid expression #{statement.inspect}") + errors.add(:variables, "Invalid expression syntax") end end end diff --git a/lib/gitlab/ci/pipeline/expression/statement.rb b/lib/gitlab/ci/pipeline/expression/statement.rb index b04576f7978..09a7c98464b 100644 --- a/lib/gitlab/ci/pipeline/expression/statement.rb +++ b/lib/gitlab/ci/pipeline/expression/statement.rb @@ -37,10 +37,6 @@ module Gitlab evaluate.present? end - def inspect - "syntax: #{@lexer.lexemes.join(' ')}" - end - def valid? parse_tree.is_a?(Lexeme::Base) rescue StatementError |