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
d6a6a907
Commit
d6a6a907
authored
Dec 16, 2019
by
Fabio Pitino
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable feature flag by default
parent
69c9af3e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
ee/lib/ee/gitlab/ci/config/entry/trigger.rb
ee/lib/ee/gitlab/ci/config/entry/trigger.rb
+2
-2
No files found.
ee/lib/ee/gitlab/ci/config/entry/trigger.rb
View file @
d6a6a907
...
...
@@ -26,7 +26,7 @@ module EE
strategy
:CrossProjectTrigger
,
if:
->
(
config
)
{
!
config
.
key?
(
:include
)
}
strategy
:SameProjectTrigger
,
if:
->
(
config
)
do
::
Feature
.
enabled?
(
:ci_parent_child_pipeline
)
&&
::
Feature
.
enabled?
(
:ci_parent_child_pipeline
,
default_enabled:
true
)
&&
config
.
key?
(
:include
)
end
...
...
@@ -73,7 +73,7 @@ module EE
class
UnknownStrategy
<
::
Gitlab
::
Config
::
Entry
::
Node
def
errors
if
::
Feature
.
enabled?
(
:ci_parent_child_pipeline
)
if
::
Feature
.
enabled?
(
:ci_parent_child_pipeline
,
default_enabled:
true
)
[
'config must specify either project or include'
]
else
[
'config must specify project'
]
...
...
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