summaryrefslogtreecommitdiff
path: root/app/views/projects/pipelines/charts/_overall.haml
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2017-06-26 11:41:25 +0200
committerMarin Jankovski <maxlazio@gmail.com>2017-06-26 11:41:25 +0200
commit07f6ab2b5339e3db171b6b53c972e1bdf17dffc9 (patch)
tree6e2814ba4742aa5d69ad58e0f1c62a1f99ab5de3 /app/views/projects/pipelines/charts/_overall.haml
parent72111fad944d9506bc6d1769bc28ff3525004023 (diff)
parent27b98beac94fdc70ba30bfd126b6d6cc2ea33994 (diff)
downloadgitlab-ce-07f6ab2b5339e3db171b6b53c972e1bdf17dffc9.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'app/views/projects/pipelines/charts/_overall.haml')
-rw-r--r--app/views/projects/pipelines/charts/_overall.haml12
1 files changed, 4 insertions, 8 deletions
diff --git a/app/views/projects/pipelines/charts/_overall.haml b/app/views/projects/pipelines/charts/_overall.haml
index 0b7e3d22dd7..93083397d5b 100644
--- a/app/views/projects/pipelines/charts/_overall.haml
+++ b/app/views/projects/pipelines/charts/_overall.haml
@@ -2,18 +2,14 @@
%ul
%li
Total:
- %strong= pluralize @project.builds.count(:all), 'job'
+ %strong= pluralize @counts[:total], 'pipeline'
%li
Successful:
- %strong= pluralize @project.builds.success.count(:all), 'job'
+ %strong= pluralize @counts[:success], 'pipeline'
%li
Failed:
- %strong= pluralize @project.builds.failed.count(:all), 'job'
+ %strong= pluralize @counts[:failed], 'pipeline'
%li
Success ratio:
%strong
- #{success_ratio(@project.builds.success, @project.builds.failed)}%
- %li
- Commits covered:
- %strong
- = @project.pipelines.count(:all)
+ #{success_ratio(@counts)}%