summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortiagonbotelho <tiagonbotelho@hotmail.com>2016-08-22 13:56:07 +0100
committertiagonbotelho <tiagonbotelho@hotmail.com>2016-08-24 09:03:25 +0100
commit0762f680c653dff9ff45fe0ce72136b39e125979 (patch)
treebd6455727d4c82e2378a6fab67f264c0e5db0e0b
parent02591b043052eb4f8041f8cf51546fab272d7b61 (diff)
downloadgitlab-ce-20909-use-total-count-instead-of-size.tar.gz
change from members using size to start using total_count in the group20909-use-total-count-instead-of-size
members page
-rw-r--r--CHANGELOG1
-rw-r--r--app/views/groups/group_members/index.html.haml2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index ef38d3e29f5..d9b8372be18 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@ v 8.12.0 (unreleased)
v 8.11.1 (unreleased)
- Fix file links on project page when default view is Files !5933
+ - Change using size to use count and caching it for number of group members
v 8.11.0
- Use test coverage value from the latest successful pipeline in badge. !5862
diff --git a/app/views/groups/group_members/index.html.haml b/app/views/groups/group_members/index.html.haml
index 90f362c052b..f789796e942 100644
--- a/app/views/groups/group_members/index.html.haml
+++ b/app/views/groups/group_members/index.html.haml
@@ -17,7 +17,7 @@
.panel-heading
%strong #{@group.name}
group members
- %span.badge= @members.size
+ %span.badge= @members.total_count
.controls
= form_tag group_group_members_path(@group), method: :get, class: 'form-inline member-search-form' do
.form-group