diff options
| author | drew cimino <dcimino@gitlab.com> | 2019-06-12 18:50:42 -0400 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-06-13 06:29:41 -0700 |
| commit | cbb05dcad9a26446549994cb295d6cd0d85a33c2 (patch) | |
| tree | 456920c89548e4dbbde85e3285e1a484522d5788 | |
| parent | 0a70ba177e4589733659dd5af85402d0a3081026 (diff) | |
| download | gitlab-ce-cbb05dcad9a26446549994cb295d6cd0d85a33c2.tar.gz | |
Disable CI variable complex expressions by default
| -rw-r--r-- | lib/gitlab/ci/pipeline/expression/lexeme/matches.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/ci/pipeline/expression/lexeme/pattern.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/ci/pipeline/expression/lexer.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/ci/pipeline/expression/parser.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/ci/pipeline/expression/lexeme/matches.rb b/lib/gitlab/ci/pipeline/expression/lexeme/matches.rb index ecfab627226..d7f47c0e7e6 100644 --- a/lib/gitlab/ci/pipeline/expression/lexeme/matches.rb +++ b/lib/gitlab/ci/pipeline/expression/lexeme/matches.rb @@ -36,7 +36,7 @@ module Gitlab private def ci_variables_complex_expressions? - Feature.enabled?(:ci_variables_complex_expressions, default_enabled: true) + Feature.enabled?(:ci_variables_complex_expressions) end end end diff --git a/lib/gitlab/ci/pipeline/expression/lexeme/pattern.rb b/lib/gitlab/ci/pipeline/expression/lexeme/pattern.rb index e4cf360a1c1..eb32dffc454 100644 --- a/lib/gitlab/ci/pipeline/expression/lexeme/pattern.rb +++ b/lib/gitlab/ci/pipeline/expression/lexeme/pattern.rb @@ -34,7 +34,7 @@ module Gitlab end 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 diff --git a/lib/gitlab/ci/pipeline/expression/lexer.rb b/lib/gitlab/ci/pipeline/expression/lexer.rb index 22c210ae26b..23aa1ca4a36 100644 --- a/lib/gitlab/ci/pipeline/expression/lexer.rb +++ b/lib/gitlab/ci/pipeline/expression/lexer.rb @@ -73,7 +73,7 @@ module Gitlab end 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 diff --git a/lib/gitlab/ci/pipeline/expression/parser.rb b/lib/gitlab/ci/pipeline/expression/parser.rb index 589bf32a4d7..0679ed329e5 100644 --- a/lib/gitlab/ci/pipeline/expression/parser.rb +++ b/lib/gitlab/ci/pipeline/expression/parser.rb @@ -13,7 +13,7 @@ module Gitlab end def tree - if Feature.enabled?(:ci_variables_complex_expressions, default_enabled: true) + if Feature.enabled?(:ci_variables_complex_expressions) rpn_parse_tree else reverse_descent_parse_tree |