Merge branch 'boolean-values-from-matches-operator' into 'master'

return boolean from Pipeline::Expression::Lexeme::Matches#evaluate

See merge request gitlab-org/gitlab-ce!29717

1 files changed, 0 insertions, 16 deletions

diff --git a/lib/gitlab/ci/pipeline/expression/lexeme/matches.rb b/lib/gitlab/ci/pipeline/expression/lexeme/matches.rb
index d7f47c0e7e6..942e4e55323 100644
--- a/lib/gitlab/ci/pipeline/expression/lexeme/matches.rb
+++ b/lib/gitlab/ci/pipeline/expression/lexeme/matches.rb
@@ -13,16 +13,6 @@ module Gitlab
               regexp = @right.evaluate(variables)
 
               regexp.scan(text.to_s).any?
-
-              if ci_variables_complex_expressions?
-                # return offset of first match, or nil if no matches
-                if match = regexp.scan(text.to_s).first
-                  text.to_s.index(match)
-                end
-              else
-                # return true or false
-                regexp.scan(text.to_s).any?
-              end
             end
 
             def self.build(_value, behind, ahead)
@@ -32,12 +22,6 @@ module Gitlab
             def self.precedence
               10 # See: https://ruby-doc.org/core-2.5.0/doc/syntax/precedence_rdoc.html
             end
-
-            private
-
-            def ci_variables_complex_expressions?
-              Feature.enabled?(:ci_variables_complex_expressions)
-            end
           end
         end
       end