diff options
-rw-r--r-- | app/views/charts/_build_times.haml | 2 | ||||
-rw-r--r-- | lib/charts.rb | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/views/charts/_build_times.haml b/app/views/charts/_build_times.haml index e84223d..c3c2f57 100644 --- a/app/views/charts/_build_times.haml +++ b/app/views/charts/_build_times.haml @@ -1,6 +1,6 @@ %fieldset %legend - Build duration in minutes for last 30 builds + Commit duration in minutes for last 30 commits %canvas#build_timesChart.padded{width: 800, height: 300} diff --git a/lib/charts.rb b/lib/charts.rb index c84987c..851518f 100644 --- a/lib/charts.rb +++ b/lib/charts.rb @@ -55,10 +55,10 @@ module Charts class BuildTime < Chart def collect - builds = project.builds.where('builds.finished_at is NOT NULL AND builds.started_at is NOT NULL').last(30) - builds.each do |build| - @labels << build.short_sha - @build_times << (build.duration / 60) + commits = project.commits.joins(:builds).where('builds.finished_at is NOT NULL AND builds.started_at is NOT NULL').last(30) + commits.each do |commit| + @labels << commit.short_sha + @build_times << (commit.duration / 60) end end end |