diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-08 01:17:55 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-08 01:17:55 +0300 |
| commit | 39fbec941939f76ec08a25f537cc3f4a308e21f5 (patch) | |
| tree | a68be2fcc445d9c4efd10abf6000c6a29efdafd0 /app/views/projects | |
| parent | 5541e55c491eb86567c8c1f28457e894a4155dd1 (diff) | |
| parent | 4498bb78332ba5f03b23a4f8ddba2eb034830b39 (diff) | |
Merge branch '18181-pipeline-duration' into 'master'
Update time format of pipeline duration
Closes #18181
Part of #18920
See merge request !5121
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/ci/pipelines/_pipeline.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml index e38d1ff5ff0..af8dd5cd02c 100644 --- a/app/views/projects/ci/pipelines/_pipeline.html.haml +++ b/app/views/projects/ci/pipelines/_pipeline.html.haml @@ -45,7 +45,7 @@ %td - if pipeline.started_at && pipeline.finished_at %p.duration - #{duration_in_words(pipeline.finished_at, pipeline.started_at)} + = duration_in_numbers(pipeline.finished_at, pipeline.started_at) %td .controls.hidden-xs.pull-right |