diff options
| author | Phil Hughes <me@iamphill.com> | 2016-09-01 15:27:42 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-09-13 08:44:59 +0100 |
| commit | e33cda96cb20f47fdde4314f6bb00e43bbf5aeb4 (patch) | |
| tree | a9e2e598514374b479542f58e97c283027d0a14d /app/views/projects/project_members | |
| parent | 23993147fbf24e868d33927dc1194b60a106076d (diff) | |
| download | gitlab-ce-e33cda96cb20f47fdde4314f6bb00e43bbf5aeb4.tar.gz | |
Fixed group members not deleting
Combine both group members & project members in project members list
Diffstat (limited to 'app/views/projects/project_members')
| -rw-r--r-- | app/views/projects/project_members/_team.html.haml | 6 | ||||
| -rw-r--r-- | app/views/projects/project_members/index.html.haml | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/views/projects/project_members/_team.html.haml b/app/views/projects/project_members/_team.html.haml index 6a8b28d3886..23c35f91b6b 100644 --- a/app/views/projects/project_members/_team.html.haml +++ b/app/views/projects/project_members/_team.html.haml @@ -2,6 +2,8 @@ .panel-heading Users with access to %strong #{@project.name} - %span.badge= members.size + %span.badge= @project_members_size %ul.content-list - = render partial: 'shared/members/member', collection: members, as: :member + - members.each do |user| + - member = @project.team.find_member(user.id) + = render 'shared/members/member', member: member diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml index 42a23057ff1..85e512a75f4 100644 --- a/app/views/projects/project_members/index.html.haml +++ b/app/views/projects/project_members/index.html.haml @@ -25,3 +25,4 @@ = render 'groups', groups: @groups = render 'team', members: @project_members + = paginate @project_members, theme: "gitlab" |