Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
afc984f7
Commit
afc984f7
authored
Jun 21, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
e4409858
1f3086a9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
lib/gitlab/ci/pipeline/expression/lexeme/pattern.rb
lib/gitlab/ci/pipeline/expression/lexeme/pattern.rb
+1
-1
lib/gitlab/ci/pipeline/expression/lexer.rb
lib/gitlab/ci/pipeline/expression/lexer.rb
+1
-1
lib/gitlab/ci/pipeline/expression/parser.rb
lib/gitlab/ci/pipeline/expression/parser.rb
+1
-1
No files found.
lib/gitlab/ci/pipeline/expression/lexeme/pattern.rb
View file @
afc984f7
...
@@ -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
)
Feature
.
enabled?
(
:ci_variables_complex_expressions
,
default_enabled:
true
)
end
end
end
end
end
end
...
...
lib/gitlab/ci/pipeline/expression/lexer.rb
View file @
afc984f7
...
@@ -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
)
?
NEW_LEXEMES
:
LEXEMES
Feature
.
enabled?
(
:ci_variables_complex_expressions
,
default_enabled:
true
)
?
NEW_LEXEMES
:
LEXEMES
end
end
end
end
end
end
...
...
lib/gitlab/ci/pipeline/expression/parser.rb
View file @
afc984f7
...
@@ -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
)
if
Feature
.
enabled?
(
:ci_variables_complex_expressions
,
default_enabled:
true
)
rpn_parse_tree
rpn_parse_tree
else
else
reverse_descent_parse_tree
reverse_descent_parse_tree
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment