diff options
author | Rémy Coutable <remy@rymai.me> | 2016-07-18 16:44:10 +0200 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-07-18 16:44:10 +0200 |
commit | dd4f50b1874ac066c7e47be223e98d8a9b317fc7 (patch) | |
tree | 268c37d3711d1eaa0a9eb78687b0f5f15b9d1230 /app/views/projects | |
parent | 017ae313dc84682e260e960f93fb4a55af0df523 (diff) | |
download | gitlab-ce-dd4f50b1874ac066c7e47be223e98d8a9b317fc7.tar.gz |
Fix build duration when build is not finished yet19937-fix-wrong-build-elapsed-time
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/views/projects')
-rw-r--r-- | app/views/projects/builds/_sidebar.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/builds/_sidebar.html.haml b/app/views/projects/builds/_sidebar.html.haml index cab21f0cf19..960d43039f4 100644 --- a/app/views/projects/builds/_sidebar.html.haml +++ b/app/views/projects/builds/_sidebar.html.haml @@ -49,7 +49,7 @@ - if @build.duration %p.build-detail-row %span.build-light-text Duration: - #{duration_in_words(@build.finished_at, @build.started_at)} + = time_interval_in_words(@build.duration) - if @build.finished_at %p.build-detail-row %span.build-light-text Finished: 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 542827b2f15..331dc1fcc29 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 @@ -51,7 +51,7 @@ %td.duration - if generic_commit_status.duration = icon("clock-o") - #{duration_in_words(generic_commit_status.finished_at, generic_commit_status.started_at)} + = time_interval_in_words(generic_commit_status.duration) %td.timestamp - if generic_commit_status.finished_at |