Commit afc984f7 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents e4409858 1f3086a9
......@@ -34,7 +34,7 @@ module Gitlab
end
def self.eager_matching_with_escape_characters?
Feature.enabled?(:ci_variables_complex_expressions)
Feature.enabled?(:ci_variables_complex_expressions, default_enabled: true)
end
end
end
......
......@@ -73,7 +73,7 @@ module Gitlab
end
def available_lexemes
Feature.enabled?(:ci_variables_complex_expressions) ? NEW_LEXEMES : LEXEMES
Feature.enabled?(:ci_variables_complex_expressions, default_enabled: true) ? NEW_LEXEMES : LEXEMES
end
end
end
......
......@@ -13,7 +13,7 @@ module Gitlab
end
def tree
if Feature.enabled?(:ci_variables_complex_expressions)
if Feature.enabled?(:ci_variables_complex_expressions, default_enabled: true)
rpn_parse_tree
else
reverse_descent_parse_tree
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment