Fix legacy_stages

cba9eeb6 · Kamil Trzciński · bb5193bd · cba9eeb6 · cba9eeb6
Commit cba9eeb6 authored Sep 30, 2019 by Kamil Trzciński
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

app/models/ci/pipeline.rb app/models/ci/pipeline.rb +3 -4

lib/gitlab/ci/status/composite.rb lib/gitlab/ci/status/composite.rb +1 -1

No files found.
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -407,11 +407,10 @@ module Ci
    def legacy_stages_using_composite_status
      stages = statuses.latest
-        .group_by(&:stage_idx)
+        .order(:stage_idx, :stage)
-        .sort_by(&:first)
+        .group_by(&:stage)
-      stages.map do |stage_idx, jobs|
+      stages.map do |stage_name, jobs|
-        stage_name = jobs.first.stage
        jobs_statuses = jobs.pluck(:status, :allow_failure)
        composite_status = Gitlab::Ci::Status::Composite

--- a/lib/gitlab/ci/status/composite.rb
+++ b/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