Commit b9372092 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents 1c9cb31f 4418907c
...@@ -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
......
...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment