diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-07-07 08:44:00 -0500 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-07-12 14:50:57 -0500 |
| commit | 47199c35a5555483309cdbde39c3da51e5a75d69 (patch) | |
| tree | c92a849e0e1aa8ad5a7d009a1d8e308845c78f09 | |
| parent | 33b4fc315ed504511a7f23835939ff8915e0fe01 (diff) | |
| download | gitlab-ce-47199c35a5555483309cdbde39c3da51e5a75d69.tar.gz | |
Add clock and calendar icons for duration and finished at; add finished at section in pipelines
3 files changed, 9 insertions, 0 deletions
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml index 5bd6e3f0ebc..00004163047 100644 --- a/app/views/projects/ci/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml @@ -57,10 +57,12 @@ %td.duration - if build.duration + = icon("clock-o") #{duration_in_words(build.finished_at, build.started_at)} %td.timestamp - if build.finished_at + = icon("calendar") %span #{time_ago_with_tooltip(build.finished_at)} - if defined?(coverage) && coverage diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml index af8dd5cd02c..f2c19797206 100644 --- a/app/views/projects/ci/pipelines/_pipeline.html.haml +++ b/app/views/projects/ci/pipelines/_pipeline.html.haml @@ -45,7 +45,12 @@ %td - if pipeline.started_at && pipeline.finished_at %p.duration + = icon("clock-o") = duration_in_numbers(pipeline.finished_at, pipeline.started_at) + - if pipeline.finished_at + %p.duration + = icon("calendar") + #{time_ago_with_tooltip(pipeline.finished_at)} %td .controls.hidden-xs.pull-right 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 5bc5c71283e..542827b2f15 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 @@ -50,10 +50,12 @@ %td.duration - if generic_commit_status.duration + = icon("clock-o") #{duration_in_words(generic_commit_status.finished_at, generic_commit_status.started_at)} %td.timestamp - if generic_commit_status.finished_at + = icon("calendar") %span #{time_ago_with_tooltip(generic_commit_status.finished_at)} - if defined?(coverage) && coverage |