diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-08-16 08:10:45 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-08-16 08:10:45 +0000 |
| commit | 4418907ccefc64ff26c318f9535a609353e3c3be (patch) | |
| tree | d69875d8c40252ea9fff3bcdd55f310bf79fa910 | |
| parent | 2bb475adbaf751f6f410fbdcc3c0066082ddd73b (diff) | |
| parent | 72541807b34348e7fa7e7d1ef7d119376382d8af (diff) | |
| download | gitlab-ce-4418907ccefc64ff26c318f9535a609353e3c3be.tar.gz | |
Merge branch 'enable-dag-support-by-default' into 'master'
Enable DAG support by default
Closes #65457
See merge request gitlab-org/gitlab-ce!31814
| -rw-r--r-- | app/models/ci/build.rb | 2 | ||||
| -rw-r--r-- | app/services/ci/process_pipeline_service.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index f705e67121f..3c0efca31db 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -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 diff --git a/app/services/ci/process_pipeline_service.rb b/app/services/ci/process_pipeline_service.rb index f4bd457ebc6..3b145a65d79 100644 --- a/app/services/ci/process_pipeline_service.rb +++ b/app/services/ci/process_pipeline_service.rb @@ -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 |