Commit a4e24cd6 authored by Rémy Coutable's avatar Rémy Coutable Committed by Ruben Davila

Merge branch 'order-stages-by-pipeline' into 'master'

Render stages in valid order

Currently stages in stages dropdown on builds page are not in valid order. It is important to display stages in other those are defined in the pipeline.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21133

See merge request !6430
parent e42cbe14
...@@ -16,6 +16,8 @@ v 8.12.0 (unreleased) ...@@ -16,6 +16,8 @@ v 8.12.0 (unreleased)
- Make push events have equal vertical spacing. - Make push events have equal vertical spacing.
- Add two-factor recovery endpoint to internal API !5510 - Add two-factor recovery endpoint to internal API !5510
- Pass the "Remember me" value to the U2F authentication form - Pass the "Remember me" value to the U2F authentication form
- Display stages in valid order in stages dropdown on build page
- Only update projects.last_activity_at once per hour when creating a new event
- Remove vendor prefixes for linear-gradient CSS (ClemMakesApps) - Remove vendor prefixes for linear-gradient CSS (ClemMakesApps)
- Move pushes_since_gc from the database to Redis - Move pushes_since_gc from the database to Redis
- Add font color contrast to external label in admin area (ClemMakesApps) - Add font color contrast to external label in admin area (ClemMakesApps)
......
...@@ -112,14 +112,14 @@ ...@@ -112,14 +112,14 @@
%span.label.label-primary %span.label.label-primary
= tag = tag
- if builds.size > 1 - if @build.pipeline.stages.many?
.dropdown.build-dropdown .dropdown.build-dropdown
.title Stage .title Stage
%button.dropdown-menu-toggle{type: 'button', 'data-toggle' => 'dropdown'} %button.dropdown-menu-toggle{type: 'button', 'data-toggle' => 'dropdown'}
%span.stage-selection More %span.stage-selection More
= icon('caret-down') = icon('caret-down')
%ul.dropdown-menu %ul.dropdown-menu
- builds.map(&:stage).uniq.each do |stage| - @build.pipeline.stages.each do |stage|
%li %li
%a.stage-item= stage %a.stage-item= stage
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment