diff options
| author | Marius Bobin <mbobin@gitlab.com> | 2019-08-21 18:48:16 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-08-21 18:48:16 +0000 |
| commit | 65b20f35dc2b9a52d3bac5e234f124b7b3e466a3 (patch) | |
| tree | 7e7c0dd1f18dcf46782f428944d5fc9cb0cbe2ac /lib | |
| parent | 9a0c1f64f540c1f07b2742a4c1c3ef4bee749bfd (diff) | |
| download | gitlab-ce-65b20f35dc2b9a52d3bac5e234f124b7b3e466a3.tar.gz | |
Ensure CI matching operator receives an object
Ensure the evaluation of right-hand side expression always
results in the returning of an object or an empty String
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ci/pipeline/expression/lexeme/matches.rb | 3 | ||||
| -rw-r--r-- | lib/gitlab/ci/pipeline/expression/lexeme/not_matches.rb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/gitlab/ci/pipeline/expression/lexeme/matches.rb b/lib/gitlab/ci/pipeline/expression/lexeme/matches.rb index 942e4e55323..f7b0720d4a9 100644 --- a/lib/gitlab/ci/pipeline/expression/lexeme/matches.rb +++ b/lib/gitlab/ci/pipeline/expression/lexeme/matches.rb @@ -11,8 +11,9 @@ module Gitlab def evaluate(variables = {}) text = @left.evaluate(variables) regexp = @right.evaluate(variables) + return false unless regexp - regexp.scan(text.to_s).any? + regexp.scan(text.to_s).present? end def self.build(_value, behind, ahead) diff --git a/lib/gitlab/ci/pipeline/expression/lexeme/not_matches.rb b/lib/gitlab/ci/pipeline/expression/lexeme/not_matches.rb index 831c27fa0ea..02479ed28a4 100644 --- a/lib/gitlab/ci/pipeline/expression/lexeme/not_matches.rb +++ b/lib/gitlab/ci/pipeline/expression/lexeme/not_matches.rb @@ -11,8 +11,9 @@ module Gitlab def evaluate(variables = {}) text = @left.evaluate(variables) regexp = @right.evaluate(variables) + return true unless regexp - regexp.scan(text.to_s).none? + regexp.scan(text.to_s).empty? end def self.build(_value, behind, ahead) |