diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-06-21 11:28:43 +0300 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-06-21 11:28:43 +0300 |
commit | 1f3086a99c5837d50da0e2a55fdbb194d6a699a3 (patch) | |
tree | dbdaa04f71fbeb8543a24aec54192dc76d5fb6a8 | |
parent | 51df2ca5c5a1b18155b7bba9bdc26c165533428b (diff) | |
parent | f3b2dde8e294a70ca798d165cc8e5dfa62547ca6 (diff) |
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
-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 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/ci/pipeline/expression/lexeme/pattern.rb b/lib/gitlab/ci/pipeline/expression/lexeme/pattern.rb index eb32dffc454..e4cf360a1c1 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) + Feature.enabled?(:ci_variables_complex_expressions, default_enabled: true) end end end diff --git a/lib/gitlab/ci/pipeline/expression/lexer.rb b/lib/gitlab/ci/pipeline/expression/lexer.rb index 23aa1ca4a36..22c210ae26b 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) ? NEW_LEXEMES : LEXEMES + Feature.enabled?(:ci_variables_complex_expressions, default_enabled: true) ? 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 0679ed329e5..589bf32a4d7 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) + if Feature.enabled?(:ci_variables_complex_expressions, default_enabled: true) rpn_parse_tree else reverse_descent_parse_tree |