summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone <annabel.dunstone@gmail.com>2016-08-08 16:26:33 -0500
committerAnnabel Dunstone <annabel.dunstone@gmail.com>2016-08-09 15:11:17 -0500
commit3b4fb0bbdc13f5b52d1a4d30128d0d2d99b97e72 (patch)
treee0df1ff97176531a24064a937852c2fdcca6e15b
parent37013c6de09b13bcee478a1eaa2bd8fb42a35f66 (diff)
downloadgitlab-ce-3b4fb0bbdc13f5b52d1a4d30128d0d2d99b97e72.tar.gz
Add build data to top of pipeline page
-rw-r--r--app/assets/stylesheets/pages/pipelines.scss6
-rw-r--r--app/views/projects/commit/_pipeline.html.haml12
2 files changed, 18 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 21919fe4d73..5bc8c3a7e6c 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -229,3 +229,9 @@
box-shadow: none;
}
}
+
+// Pipeline visualization
+.stage-column {
+ display: inline-block;
+ vertical-align: top;
+}
diff --git a/app/views/projects/commit/_pipeline.html.haml b/app/views/projects/commit/_pipeline.html.haml
index 540689f4a61..a52bfa0ea55 100644
--- a/app/views/projects/commit/_pipeline.html.haml
+++ b/app/views/projects/commit/_pipeline.html.haml
@@ -1,4 +1,16 @@
.row-content-block.build-content.middle-block
+ .pipeline-visualization
+ - pipeline.statuses.stages.each do |stage|
+ - statuses = pipeline.statuses.where(stage: stage)
+ .stage-column
+ %strong
+ %a{name: stage}
+ - if stage
+ = stage.titleize
+ - statuses.each do |status|
+ %div= status.name
+
+
.pull-right
- if can?(current_user, :update_pipeline, pipeline.project)
- if pipeline.builds.latest.failed.any?(&:retryable?)