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:
commit
4418907cce
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
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
|
||||||
|
|
Loading…
Reference in New Issue