diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-09 02:15:20 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-09 02:15:20 +0000 |
| commit | cbb9da3d656482f5a6e046ec791d49390fc23fd7 (patch) | |
| tree | 33eee2f520787e008a9ccf5ce3cb961bfb3c8759 | |
| parent | 6213263d323e21357f682bb752c4dd9eb8421a03 (diff) | |
| parent | 9dd26749634648e2cd27b223eea5d291c0a78f37 (diff) | |
| download | gitlab-ce-cbb9da3d656482f5a6e046ec791d49390fc23fd7.tar.gz | |
Merge branch 'fix-group-members' into 'master'
Fix only 20 group members showing on project member page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !2030
| -rw-r--r-- | app/controllers/projects/project_members_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/project_members/_group_members.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb index 07eb94e4f48..8364fc293b7 100644 --- a/app/controllers/projects/project_members_controller.rb +++ b/app/controllers/projects/project_members_controller.rb @@ -23,7 +23,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController @group_members = @group_members.where(user_id: users) end - @group_members = @group_members.order('access_level DESC').limit(20) + @group_members = @group_members.order('access_level DESC') end @project_member = @project.project_members.new diff --git a/app/views/projects/project_members/_group_members.html.haml b/app/views/projects/project_members/_group_members.html.haml index d2810f9707a..1c2458fa144 100644 --- a/app/views/projects/project_members/_group_members.html.haml +++ b/app/views/projects/project_members/_group_members.html.haml @@ -10,7 +10,7 @@ = icon('pencil-square-o') Manage group members %ul.content-list - - members.each do |member| + - members.limit(20).each do |member| = render 'groups/group_members/group_member', member: member, show_controls: false - if members.count > 20 %li |