Add latest changes from gitlab-org/gitlab@master

3 files changed, 10 insertions, 10 deletions

diff --git a/app/services/ci/compare_reports_base_service.rb b/app/services/ci/compare_reports_base_service.rb
index 83ba70e8437..2e84f914db3 100644
--- a/app/services/ci/compare_reports_base_service.rb
+++ b/app/services/ci/compare_reports_base_service.rb
@@ -8,7 +8,8 @@ module Ci
   # issue: https://gitlab.com/gitlab-org/gitlab/issues/34224
   class CompareReportsBaseService < ::BaseService
     def execute(base_pipeline, head_pipeline)
-      comparer = comparer_class.new(get_report(base_pipeline), get_report(head_pipeline))
+      comparer = build_comparer(base_pipeline, head_pipeline)
+
       {
         status: :parsed,
         key: key(base_pipeline, head_pipeline),
@@ -28,6 +29,12 @@ module Ci
       data&.fetch(:key, nil) == key(base_pipeline, head_pipeline)
     end
 
+    protected
+
+    def build_comparer(base_pipeline, head_pipeline)
+      comparer_class.new(get_report(base_pipeline), get_report(head_pipeline))
+    end
+
     private
 
     def key(base_pipeline, head_pipeline)
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