summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2016-11-28 21:04:50 -0600
committerMike Greiling <mike@pixelcog.com>2016-11-29 12:55:07 -0600
commita2ea78a09d689d2f53c22859f8304e6c1288bf17 (patch)
tree423caee1f64c51a7fcbcf014507b526e87a2106f /app/views
parent3e0651c7cd0c8dc402dc45387e08ae04731ab46c (diff)
downloadgitlab-ce-a2ea78a09d689d2f53c22859f8304e6c1288bf17.tar.gz
reformat build duration and finish time to match /ci/builds/_build.html.haml
Diffstat (limited to 'app/views')
-rw-r--r--app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml20
1 files changed, 12 insertions, 8 deletions
diff --git a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
index d9b34ba3c43..4fff082202d 100644
--- a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
+++ b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
@@ -73,17 +73,21 @@
%td
= generic_commit_status.name
- %td.duration
+ %td
- if generic_commit_status.duration
- = icon("clock-o")
- = time_interval_in_words(generic_commit_status.duration)
+ %p.duration
+ = custom_icon("icon_timer")
+ = duration_in_numbers(generic_commit_status.duration)
- %td.timestamp
- if generic_commit_status.finished_at
- = icon("calendar")
- %span #{time_ago_with_tooltip(generic_commit_status.finished_at)}
+ %p.finished-at
+ = icon("calendar")
+ %span #{time_ago_with_tooltip(generic_commit_status.finished_at)}
- - if coverage
- %td.coverage
+ %td.coverage
+ - if coverage
- if generic_commit_status.try(:coverage)
#{generic_commit_status.coverage}%
+
+ %td
+ -# empty column to match number of columns in ci/builds/_build.html.haml