kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'enable-dag-support-by-default' into 'master' 

Enable DAG support by default

Closes #65457

See merge request gitlab-org/gitlab-ce!31814
This commit is contained in:
Kamil Trzciński 2019-08-16 08:10:45 +00:00
parent 2bb475adba 72541807b3
commit 4418907cce
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/ci/build.rb
View File

@ -716,7 +716,7 @@ module Ci
depended_jobs = depends_on_builds
# 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))
end

4
app/services/ci/process_pipeline_service.rb
View File

@ -40,7 +40,7 @@ module Ci
def process_builds_with_needs(trigger_build_ids)
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:
# 1. because of current dependency,
@ -96,7 +96,7 @@ module Ci
end
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
else
pipeline.processables.created