From 61bc90af0ea247c5f561d8b71348ab028566033d Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Tue, 6 Sep 2016 19:57:51 +0800 Subject: [PATCH] Be more specific since it's not needed to be generic now, feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_14995016 --- lib/gitlab/ci/pipeline_duration.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/gitlab/ci/pipeline_duration.rb b/lib/gitlab/ci/pipeline_duration.rb index 711f911346c..10ad70f14fa 100644 --- a/lib/gitlab/ci/pipeline_duration.rb +++ b/lib/gitlab/ci/pipeline_duration.rb @@ -91,12 +91,14 @@ module Gitlab builds = pipeline.builds.latest. where(status: status).where.not(started_at: nil).order(:started_at) - from_builds(builds, :started_at, :finished_at) + from_builds(builds) end - def from_builds(builds, from, to, now = Time.now) + def from_builds(builds) + now = Time.now + periods = builds.map do |b| - Period.new(b.public_send(from) || now, b.public_send(to) || now) + Period.new(b.started_at, b.finished_at || now) end from_periods(periods)