Merge branch '18181-pipeline-duration' into 'master'

Update time format of pipeline duration

Closes #18181

Part of #18920 

See merge request !5121

2 files changed, 8 insertions, 1 deletions

diff --git a/app/helpers/time_helper.rb b/app/helpers/time_helper.rb
index b04b0a5114c..8cb82c2d5cc 100644
--- a/app/helpers/time_helper.rb
+++ b/app/helpers/time_helper.rb
@@ -23,4 +23,11 @@ module TimeHelper
   def date_from_to(from, to)
     "#{from.to_s(:short)} - #{to.to_s(:short)}"
   end
+
+  def duration_in_numbers(finished_at, started_at)
+    diff_in_seconds = finished_at.to_i - started_at.to_i
+    time_format = diff_in_seconds < 1.hour ? "%M:%S" : "%H:%M:%S"
+
+    Time.at(diff_in_seconds).utc.strftime(time_format)
+  end
 end
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