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
96f256b4
Commit
96f256b4
authored
Apr 28, 2020
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove FF ci_parent_child_pipeline
This commit removes the FF
parent
d58353db
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
20 deletions
+2
-20
lib/gitlab/ci/config/entry/trigger.rb
lib/gitlab/ci/config/entry/trigger.rb
+2
-7
spec/lib/gitlab/ci/config/entry/trigger_spec.rb
spec/lib/gitlab/ci/config/entry/trigger_spec.rb
+0
-13
No files found.
lib/gitlab/ci/config/entry/trigger.rb
View file @
96f256b4
...
...
@@ -25,8 +25,7 @@ module Gitlab
strategy
:CrossProjectTrigger
,
if:
->
(
config
)
{
!
config
.
key?
(
:include
)
}
strategy
:SameProjectTrigger
,
if:
->
(
config
)
do
::
Feature
.
enabled?
(
:ci_parent_child_pipeline
,
default_enabled:
true
)
&&
config
.
key?
(
:include
)
config
.
key?
(
:include
)
end
class
CrossProjectTrigger
<
::
Gitlab
::
Config
::
Entry
::
Node
...
...
@@ -72,11 +71,7 @@ module Gitlab
class
UnknownStrategy
<
::
Gitlab
::
Config
::
Entry
::
Node
def
errors
if
::
Feature
.
enabled?
(
:ci_parent_child_pipeline
,
default_enabled:
true
)
[
'config must specify either project or include'
]
else
[
'config must specify project'
]
end
[
'config must specify either project or include'
]
end
end
end
...
...
spec/lib/gitlab/ci/config/entry/trigger_spec.rb
View file @
96f256b4
...
...
@@ -114,19 +114,6 @@ describe Gitlab::Ci::Config::Entry::Trigger do
.
to
match
/config contains unknown keys: branch/
end
end
context
'when feature flag is off'
do
before
do
stub_feature_flags
(
ci_parent_child_pipeline:
false
)
end
let
(
:config
)
{
{
include:
'path/to/config.yml'
}
}
it
'is returns an error if include is used'
do
expect
(
subject
.
errors
.
first
)
.
to
match
/config must specify project/
end
end
end
context
'when config contains unknown keys'
do
...
...
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