Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/services/ci/pipeline_processing')
-rw-r--r--app/services/ci/pipeline_processing/atomic_processing_service.rb2
-rw-r--r--app/services/ci/pipeline_processing/legacy_processing_service.rb9
2 files changed, 2 insertions, 9 deletions
diff --git a/app/services/ci/pipeline_processing/atomic_processing_service.rb b/app/services/ci/pipeline_processing/atomic_processing_service.rb
index 55846c3cb5c..2a1bf15b9a3 100644
--- a/app/services/ci/pipeline_processing/atomic_processing_service.rb
+++ b/app/services/ci/pipeline_processing/atomic_processing_service.rb
@@ -93,7 +93,7 @@ module Ci
end
def processable_status(processable)
- if Feature.enabled?(:ci_dag_support, project, default_enabled: true) && processable.scheduling_type_dag?
+ if processable.scheduling_type_dag?
# Processable uses DAG, get status of all dependent needs
@collection.status_for_names(processable.aggregated_needs_names.to_a)
else
diff --git a/app/services/ci/pipeline_processing/legacy_processing_service.rb b/app/services/ci/pipeline_processing/legacy_processing_service.rb
index 8d7b80282fc..c471f7f0011 100644
--- a/app/services/ci/pipeline_processing/legacy_processing_service.rb
+++ b/app/services/ci/pipeline_processing/legacy_processing_service.rb
@@ -43,8 +43,6 @@ module Ci
end
def process_dag_builds_without_needs
- return false unless Feature.enabled?(:ci_dag_support, project, default_enabled: true)
-
created_processables.scheduling_type_dag.without_needs.each do |build|
process_build(build, 'success')
end
@@ -52,7 +50,6 @@ module Ci
def process_dag_builds_with_needs(trigger_build_ids)
return false unless trigger_build_ids.present?
- return false unless Feature.enabled?(:ci_dag_support, project, default_enabled: true)
# we find processables that are dependent:
# 1. because of current dependency,
@@ -110,11 +107,7 @@ module Ci
end
def created_stage_scheduled_processables
- if Feature.enabled?(:ci_dag_support, project, default_enabled: true)
- created_processables.scheduling_type_stage
- else
- created_processables
- end
+ created_processables.scheduling_type_stage
end
def created_processables