1 files changed, 24 insertions, 24 deletions

diff --git a/lib/gitlab/ci/status/composite.rb b/lib/gitlab/ci/status/composite.rb
index 002bd846ab1..1ba78b357e5 100644
--- a/lib/gitlab/ci/status/composite.rb
+++ b/lib/gitlab/ci/status/composite.rb
@@ -8,17 +8,18 @@ module Gitlab
 
         # This class accepts an array of arrays/hashes/or objects
         # `with_allow_failure` will be removed when deleting ci_remove_ensure_stage_service
-        def initialize(all_statuses, with_allow_failure: true, dag: false)
-          unless all_statuses.respond_to?(:pluck)
-            raise ArgumentError, "all_statuses needs to respond to `.pluck`"
+        def initialize(all_jobs, with_allow_failure: true, dag: false, project: nil)
+          unless all_jobs.respond_to?(:pluck)
+            raise ArgumentError, "all_jobs needs to respond to `.pluck`"
           end
 
           @status_set = Set.new
           @status_key = 0
           @allow_failure_key = 1 if with_allow_failure
           @dag = dag
+          @project = project
 
-          consume_all_statuses(all_statuses)
+          consume_all_jobs(all_jobs)
         end
 
         # The status calculation is order dependent,
@@ -28,11 +29,13 @@ module Gitlab
         #    based on what statuses are no longer valid based on the
         #    data set that we have
         #
-        # This method is used for two cases:
-        # 1. When it is called for a stage or a pipeline (with `all_statuses` from all jobs in a stage or a pipeline),
+        # This method is used for three cases:
+        # 1. When it is called for a stage or a pipeline (with `all_jobs` from all jobs in a stage or a pipeline),
         #    then, the returned status is assigned to the stage or pipeline.
-        # 2. When it is called for a job (with `all_statuses` from all previous jobs or all needed jobs),
+        # 2. When it is called for a job (with `all_jobs` from all previous jobs or all needed jobs),
         #    then, the returned status is used to determine if the job is processed or not.
+        # 3. When it is called for a group (of jobs that are related),
+        #    then, the returned status is used to show the overall status of the group.
         # rubocop: disable Metrics/CyclomaticComplexity
         # rubocop: disable Metrics/PerceivedComplexity
         def status
@@ -42,9 +45,6 @@ module Gitlab
             if @dag && any_skipped_or_ignored?
               # The DAG job is skipped if one of the needs does not run at all.
               'skipped'
-            elsif @dag && !only_of?(:success, :failed, :canceled, :skipped, :success_with_warnings)
-              # DAG is blocked from executing if a dependent is not "complete"
-              'pending'
             elsif only_of?(:skipped, :ignored)
               'skipped'
             elsif only_of?(:success, :skipped, :success_with_warnings, :ignored)
@@ -101,41 +101,41 @@ module Gitlab
           any_of?(:skipped) || any_of?(:ignored)
         end
 
-        def consume_all_statuses(all_statuses)
+        def consume_all_jobs(all_jobs)
           columns = []
           columns[@status_key] = :status
           columns[@allow_failure_key] = :allow_failure if @allow_failure_key
 
-          all_statuses
+          all_jobs
             .pluck(*columns) # rubocop: disable CodeReuse/ActiveRecord
-            .each do |status_attrs|
-              consume_status(Array.wrap(status_attrs))
+            .each do |job_attrs|
+              consume_job_status(Array.wrap(job_attrs))
             end
         end
 
-        def consume_status(status_attrs)
+        def consume_job_status(job_attrs)
           status_result =
-            if success_with_warnings?(status_attrs)
+            if success_with_warnings?(job_attrs)
               :success_with_warnings
-            elsif ignored_status?(status_attrs)
+            elsif ignored_status?(job_attrs)
               :ignored
             else
-              status_attrs[@status_key].to_sym
+              job_attrs[@status_key].to_sym
             end
 
           @status_set.add(status_result)
         end
 
-        def success_with_warnings?(status)
+        def success_with_warnings?(job_attrs)
           @allow_failure_key &&
-            status[@allow_failure_key] &&
-            ::Ci::HasStatus::PASSED_WITH_WARNINGS_STATUSES.include?(status[@status_key])
+            job_attrs[@allow_failure_key] &&
+            ::Ci::HasStatus::PASSED_WITH_WARNINGS_STATUSES.include?(job_attrs[@status_key])
         end
 
-        def ignored_status?(status)
+        def ignored_status?(job_attrs)
           @allow_failure_key &&
-            status[@allow_failure_key] &&
-            ::Ci::HasStatus::IGNORED_STATUSES.include?(status[@status_key])
+            job_attrs[@allow_failure_key] &&
+            ::Ci::HasStatus::IGNORED_STATUSES.include?(job_attrs[@status_key])
         end
       end
     end