diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-12 18:17:30 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-12 18:17:30 -0800 |
| commit | 14d62c357d865f68673dd1efe5cd561943ec14bb (patch) | |
| tree | 03ec483ef6a44d4d389feccdf5edacd5f23ae97d /app | |
| parent | 158532ffad6dd9bb181c7645c0b8357f14f3bcca (diff) | |
| download | gitlab-ci-14d62c357d865f68673dd1efe5cd561943ec14bb.tar.gz | |
Improve UI for builds
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/builds/_build.html.haml | 19 | ||||
| -rw-r--r-- | app/views/builds/show.html.haml | 23 | ||||
| -rw-r--r-- | app/views/commits/show.html.haml | 2 |
3 files changed, 35 insertions, 9 deletions
diff --git a/app/views/builds/_build.html.haml b/app/views/builds/_build.html.haml index 1bf7415..c2f1264 100644 --- a/app/views/builds/_build.html.haml +++ b/app/views/builds/_build.html.haml @@ -8,11 +8,22 @@ %td - if build.job - = build.job.name - if build.for_tag? - %span.label.label-primary - %i.icon-tag - = build.ref + Tag + · + #{build.ref} + - else + Commit + · + #{build.short_sha} + %td + = build.job.name + - if build.tags.any? + .pull-right + - build.tag_list.each do |tag| + %span.label.label-primary + = tag + %td.duration - if build.duration diff --git a/app/views/builds/show.html.haml b/app/views/builds/show.html.haml index fd73735..4d36d2e 100644 --- a/app/views/builds/show.html.haml +++ b/app/views/builds/show.html.haml @@ -36,12 +36,16 @@ .col-md-9 .build-head.alert{class: build_status_alert_class(@build)} %h4 - Build for commit - %code #{@build.short_sha} - from + - if @build.for_tag? + Build for tag + %code #{@build.ref} + - else + Build for commit + %code #{@build.short_sha} + from - = link_to project_path(@build.project, ref: @build.ref) do - %span.label.label-primary= "#{@build.ref}" + = link_to project_path(@build.project, ref: @build.ref) do + %span.label.label-primary= "#{@build.ref}" - if @build.duration .pull-right @@ -73,6 +77,7 @@ Test coverage %h1 #{@build.coverage}% + .build-widget %h4.title Build @@ -118,6 +123,14 @@ %span.attr-name Message: #{@build.commit.git_commit_message} + - if @build.tags.any? + .build-widget + %h4.title + Tags + - @build.tag_list.each do |tag| + %span.label.label-primary + = tag + - if @builds.present? .build-widget %h4.title #{pluralize(@builds.count, "other build")} for #{@build.short_sha}: diff --git a/app/views/commits/show.html.haml b/app/views/commits/show.html.haml index a3c956a..75f7936 100644 --- a/app/views/commits/show.html.haml +++ b/app/views/commits/show.html.haml @@ -57,6 +57,7 @@ %tr %th Status %th Build ID + %th Trigger %th Job %th Duration %th Finished at @@ -74,6 +75,7 @@ %tr %th Status %th Build ID + %th Trigger %th Job %th Duration %th Finished at |