diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-06-21 08:28:43 +0000 |
|---|---|---|
| committer | 🤖 GitLab Bot 🤖 <gitlab-bot@gitlab.com> | 2019-06-22 08:39:00 +0000 |
| commit | 75387f340f657615a82e9d6ba37b0133c1a20fb1 (patch) | |
| tree | 5b6ff734af9b8ef06bd5d8ffcb7f6643c55ae077 | |
| parent | 7858a17686a3bfcc87424a3a94c6843ef6c97f9e (diff) | |
| download | gitlab-ce-12-1-auto-deploy-0010836.tar.gz | |
Merge branch 'default-enable-complex-ci-variables-expressions' into 'master'12-1-auto-deploy-0010836
Enabled complex ci variable expression statements by default
See merge request gitlab-org/gitlab-ce!29904
(cherry picked from commit 1f3086a99c5837d50da0e2a55fdbb194d6a699a3)
f3b2dde8 Enabled complex ci variable expression statements by default
| -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 |