diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-09-20 14:23:47 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-09-20 14:24:56 +0200 |
| commit | 2baa90b224b1013719890b1a208cacd94a2ba449 (patch) | |
| tree | 1a83bb94ce994b0feacec9782364afbf1bb6c317 | |
| parent | 4276172b6977bb83de2dc86ecccd48984e09955c (diff) | |
| download | gitlab-ce-2baa90b224b1013719890b1a208cacd94a2ba449.tar.gz | |
Render stages in valid order
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/projects/builds/_sidebar.html.haml | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index bc19048e94b..0fd73c3bac2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -18,6 +18,7 @@ v 8.12.0 (unreleased) - API: Ensure invitees are not returned in Members API. - 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 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 |