diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-08-24 20:52:09 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-08-24 20:52:09 +0000 |
commit | f52cf56e90b2be3edb405fe588c94b637cf5088b (patch) | |
tree | 4de74d0c1aae74826bf75bde73432ca6cf9cc111 | |
parent | 291fd85880c7a881beed5afdf89c9ca91c4c4e70 (diff) | |
parent | 0762f680c653dff9ff45fe0ce72136b39e125979 (diff) | |
download | gitlab-ce-f52cf56e90b2be3edb405fe588c94b637cf5088b.tar.gz |
Merge branch '20909-use-total-count-instead-of-size' into 'master'
changes from using size to count and caching it to get the number of members in a group
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
Closes #20909
See merge request !5935
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | app/views/groups/group_members/index.html.haml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index d9d4a515a39..8b25b94b772 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -14,6 +14,7 @@ v 8.11.2 (unreleased) v 8.11.1 (unreleased) - Does not halt the GitHub import process when an error occurs - 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 |