summaryrefslogtreecommitdiff
path: root/lib/ci/charts.rb
diff options
context:
space:
mode:
authorJeff Stubler <brunsa2@gmail.com>2015-11-12 09:05:29 -0600
committerJeff Stubler <brunsa2@gmail.com>2015-11-12 09:05:29 -0600
commit64ca9cf3e4a56a19f09160a91c5433d2ddb632cf (patch)
treef114ab02adb4815058fe7b84a1527ac5ed7a597e /lib/ci/charts.rb
parente0c64fac68b4b3acc48300956146b85e03b426ce (diff)
parent12b35c6fe85073d809a764d24b51937f63b9d098 (diff)
downloadgitlab-ce-64ca9cf3e4a56a19f09160a91c5433d2ddb632cf.tar.gz
Merge branch 'master' into diverging-branch-graphs
Diffstat (limited to 'lib/ci/charts.rb')
-rw-r--r--lib/ci/charts.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ci/charts.rb b/lib/ci/charts.rb
index 915a4f526a6..5ff7407c6fe 100644
--- a/lib/ci/charts.rb
+++ b/lib/ci/charts.rb
@@ -60,7 +60,8 @@ module Ci
class BuildTime < Chart
def collect
- commits = project.commits.joins(:builds).where("#{Ci::Build.table_name}.finished_at is NOT NULL AND #{Ci::Build.table_name}.started_at is NOT NULL").last(30)
+ commits = project.commits.last(30)
+
commits.each do |commit|
@labels << commit.short_sha
@build_times << (commit.duration / 60)