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

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