summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2015-07-10 13:32:32 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2015-07-10 13:32:32 +0000
commitd841ed56d39db1b33947b9b9c0291beaa7dcdd43 (patch)
tree9afc7861f8bd55bb8a7804982b1c37468a1d00ec /app
parent9b6e7a17d9a1a7275689b5b237940582cf1ee792 (diff)
parent39cfebdcf4225a9384ddb59578adeaec4b11d06d (diff)
downloadgitlab-ci-d841ed56d39db1b33947b9b9c0291beaa7dcdd43.tar.gz
Merge branch 'coverage-calc' into 'master'
Use builds_without_retry to calculate average coverage /cc @vsizov See merge request !197
Diffstat (limited to 'app')
-rw-r--r--app/models/commit.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb
index 3680220..e173ed4 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -211,8 +211,8 @@ class Commit < ActiveRecord::Base
end
def coverage
- if project.coverage_enabled? && builds.count(:all) > 0
- coverage_array = builds.map(&:coverage).compact
+ if project.coverage_enabled?
+ coverage_array = builds_without_retry.map(&:coverage).compact
if coverage_array.size >= 1
'%.2f' % (coverage_array.reduce(:+) / coverage_array.size)
end