diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-09-20 13:07:32 +0000 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-09-20 10:56:51 -0500 |
| commit | a4e24cd6a3c3a03f454d20b1db6700466ffc0ff9 (patch) | |
| tree | 405bddd9ab38be16f3e1c6f9d01a623f24faa0ca | |
| parent | e42cbe14e10167f322ee84aee66e69b611e9f29c (diff) | |
| download | gitlab-ce-a4e24cd6a3c3a03f454d20b1db6700466ffc0ff9.tar.gz | |
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
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | app/views/projects/builds/_sidebar.html.haml | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 3e2fd3ee15e..ad11abb63f6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -16,6 +16,8 @@ v 8.12.0 (unreleased) - Make push events have equal vertical spacing. - Add two-factor recovery endpoint to internal API !5510 - 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) - Move pushes_since_gc from the database to Redis - Add font color contrast to external label in admin area (ClemMakesApps) diff --git a/app/views/projects/builds/_sidebar.html.haml b/app/views/projects/builds/_sidebar.html.haml index 56306b05934..0aa3092baa2 100644 --- a/app/views/projects/builds/_sidebar.html.haml +++ b/app/views/projects/builds/_sidebar.html.haml @@ -112,14 +112,14 @@ %span.label.label-primary = tag - - if builds.size > 1 + - if @build.pipeline.stages.many? .dropdown.build-dropdown .title Stage %button.dropdown-menu-toggle{type: 'button', 'data-toggle' => 'dropdown'} %span.stage-selection More = icon('caret-down') %ul.dropdown-menu - - builds.map(&:stage).uniq.each do |stage| + - @build.pipeline.stages.each do |stage| %li %a.stage-item= stage |