Merge branch 'default-enable-complex-ci-variables-expressions' into 'master'

Enabled complex ci variable expression statements by default

See merge request gitlab-org/gitlab-ce!29904
This commit is contained in:
Kamil Trzciński 2019-06-21 08:28:43 +00:00
commit 1f3086a99c
3 changed files with 3 additions and 3 deletions

View file

@ -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

View file

@ -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

View file

@ -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