summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-09-06 19:57:51 +0800
committerLin Jen-Shin <godfat@godfat.org>2016-09-06 19:57:51 +0800
commit61bc90af0ea247c5f561d8b71348ab028566033d (patch)
tree127cf43f9042cabda92216a5ad2b21a258eb794a
parent7351c269deae2c28c63e793df11155e0f6c75d04 (diff)
downloadgitlab-ce-61bc90af0ea247c5f561d8b71348ab028566033d.tar.gz
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
-rw-r--r--lib/gitlab/ci/pipeline_duration.rb8
1 files 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)