summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-03-03 13:34:56 +0200
committerValery Sizov <vsv2711@gmail.com>2015-03-03 13:34:56 +0200
commit16f31cebd1679a13f210218931c33d6283ea6e02 (patch)
tree2ee253e9066141d6c4212f818dd5c44578636391 /lib
parente3b2180e57e677ab9e263200645a32d24b5147eb (diff)
parentd7df7cf927fa2a9295b8412ddb30342430e71391 (diff)
downloadgitlab-ci-16f31cebd1679a13f210218931c33d6283ea6e02.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlab-ci
Diffstat (limited to 'lib')
-rw-r--r--lib/charts.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/charts.rb b/lib/charts.rb
index 851518f..93e81a5 100644
--- a/lib/charts.rb
+++ b/lib/charts.rb
@@ -15,8 +15,12 @@ module Charts
def push(from, to, format)
@labels << from.strftime(format)
- @total << project.builds.where("? > builds.created_at AND builds.created_at > ?", to, from).count
- @success << project.builds.where("? > builds.created_at AND builds.created_at > ?", to, from).success.count
+ @total << project.builds.
+ where('? > builds.created_at AND builds.created_at > ?', to, from).
+ count(:all)
+ @success << project.builds.
+ where('? > builds.created_at AND builds.created_at > ?', to, from).
+ success.count(:all)
end
end