Commit 63e56515 authored by Stan Hu's avatar Stan Hu

Merge branch 'ci-variables-complex-expression-default-disabled' into 'master'

disable CI variable complex expressions by default

See merge request gitlab-org/gitlab-ce!29576
parents 0a70ba17 cbb05dca
...@@ -36,7 +36,7 @@ module Gitlab ...@@ -36,7 +36,7 @@ module Gitlab
private private
def ci_variables_complex_expressions? def ci_variables_complex_expressions?
Feature.enabled?(:ci_variables_complex_expressions, default_enabled: true) Feature.enabled?(:ci_variables_complex_expressions)
end end
end end
end end
......
...@@ -34,7 +34,7 @@ module Gitlab ...@@ -34,7 +34,7 @@ module Gitlab
end end
def self.eager_matching_with_escape_characters? def self.eager_matching_with_escape_characters?
Feature.enabled?(:ci_variables_complex_expressions, default_enabled: true) Feature.enabled?(:ci_variables_complex_expressions)
end end
end end
end end
......
...@@ -73,7 +73,7 @@ module Gitlab ...@@ -73,7 +73,7 @@ module Gitlab
end end
def available_lexemes def available_lexemes
Feature.enabled?(:ci_variables_complex_expressions, default_enabled: true) ? NEW_LEXEMES : LEXEMES Feature.enabled?(:ci_variables_complex_expressions) ? NEW_LEXEMES : LEXEMES
end end
end end
end end
......
...@@ -13,7 +13,7 @@ module Gitlab ...@@ -13,7 +13,7 @@ module Gitlab
end end
def tree def tree
if Feature.enabled?(:ci_variables_complex_expressions, default_enabled: true) if Feature.enabled?(:ci_variables_complex_expressions)
rpn_parse_tree rpn_parse_tree
else else
reverse_descent_parse_tree 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