Fix legacy_stages

app/models/ci/pipeline.rb

@@ -407,11 +407,10 @@ module Ci
 
     def legacy_stages_using_composite_status
       stages = statuses.latest
-        .group_by(&:stage_idx)
-        .sort_by(&:first)
+        .order(:stage_idx, :stage)
+        .group_by(&:stage)
 
-      stages.map do |stage_idx, jobs|
-        stage_name = jobs.first.stage
+      stages.map do |stage_name, jobs|
         jobs_statuses = jobs.pluck(:status, :allow_failure)
 
         composite_status = Gitlab::Ci::Status::Composite

lib/gitlab/ci/status/composite.rb

@@ -73,7 +73,7 @@ module Gitlab
 
         def only_of?(*names)
           matching = names.count { |name| @status_set.include?(name) }
-          matching > 0 && \
+          matching > 0 &&
             matching == @status_set.size
         end