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
b9372092
Commit
b9372092
authored
Aug 16, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
1c9cb31f
4418907c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/models/ci/build.rb
app/models/ci/build.rb
+1
-1
app/services/ci/process_pipeline_service.rb
app/services/ci/process_pipeline_service.rb
+2
-2
No files found.
app/models/ci/build.rb
View file @
b9372092
...
@@ -716,7 +716,7 @@ module Ci
...
@@ -716,7 +716,7 @@ module Ci
depended_jobs
=
depends_on_builds
depended_jobs
=
depends_on_builds
# find all jobs that are needed
# find all jobs that are needed
if
Feature
.
enabled?
(
:ci_dag_support
,
project
)
&&
needs
.
exists?
if
Feature
.
enabled?
(
:ci_dag_support
,
project
,
default_enabled:
true
)
&&
needs
.
exists?
depended_jobs
=
depended_jobs
.
where
(
name:
needs
.
select
(
:name
))
depended_jobs
=
depended_jobs
.
where
(
name:
needs
.
select
(
:name
))
end
end
...
...
app/services/ci/process_pipeline_service.rb
View file @
b9372092
...
@@ -40,7 +40,7 @@ module Ci
...
@@ -40,7 +40,7 @@ module Ci
def
process_builds_with_needs
(
trigger_build_ids
)
def
process_builds_with_needs
(
trigger_build_ids
)
return
false
unless
trigger_build_ids
.
present?
return
false
unless
trigger_build_ids
.
present?
return
false
unless
Feature
.
enabled?
(
:ci_dag_support
,
project
)
return
false
unless
Feature
.
enabled?
(
:ci_dag_support
,
project
,
default_enabled:
true
)
# we find processables that are dependent:
# we find processables that are dependent:
# 1. because of current dependency,
# 1. because of current dependency,
...
@@ -96,7 +96,7 @@ module Ci
...
@@ -96,7 +96,7 @@ module Ci
end
end
def
created_processables_without_needs
def
created_processables_without_needs
if
Feature
.
enabled?
(
:ci_dag_support
,
project
)
if
Feature
.
enabled?
(
:ci_dag_support
,
project
,
default_enabled:
true
)
pipeline
.
processables
.
created
.
without_needs
pipeline
.
processables
.
created
.
without_needs
else
else
pipeline
.
processables
.
created
pipeline
.
processables
.
created
...
...
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