diff options
| author | Phil Hughes <me@iamphill.com> | 2016-09-01 14:13:49 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-09-13 08:44:59 +0100 |
| commit | 23993147fbf24e868d33927dc1194b60a106076d (patch) | |
| tree | 8f359a1fe87c8da0aa38c9b91624b68d1c9b78f0 /app | |
| parent | 4afd17b2786b5bca075ac7508979fad582c65bc9 (diff) | |
| download | gitlab-ce-23993147fbf24e868d33927dc1194b60a106076d.tar.gz | |
Fixed issue with groups not displaying
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/project_members_controller.rb | 14 | ||||
| -rw-r--r-- | app/views/projects/project_members/index.html.haml | 6 |
2 files changed, 2 insertions, 18 deletions
diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb index d83e95cf097..6060ddf025b 100644 --- a/app/controllers/projects/project_members_controller.rb +++ b/app/controllers/projects/project_members_controller.rb @@ -16,20 +16,6 @@ class Projects::ProjectMembersController < Projects::ApplicationController @project_members = @project_members.order('access_level DESC') - @group = @project.group - - if @group - @group_members = @group.group_members - @group_members = @group_members.non_invite unless can?(current_user, :admin_group, @group) - - if params[:search].present? - users = @group.users.search(params[:search]).to_a - @group_members = @group_members.where(user_id: users) - end - - @group_members = @group_members.order('access_level DESC') - end - @requesters = @project.requesters if can?(current_user, :admin_project, @project) @project_member = @project.project_members.new diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml index db8a060d170..42a23057ff1 100644 --- a/app/views/projects/project_members/index.html.haml +++ b/app/views/projects/project_members/index.html.haml @@ -21,9 +21,7 @@ .form-group = search_field_tag :search, params[:search], { placeholder: 'Find existing members by name', class: 'form-control', spellcheck: false } = icon("search") - - if @grups + - if @groups.size > 0 = render 'groups', groups: @groups - = render 'team', members: @project_members - - if @group - = render "group_members", members: @group_members + = render 'team', members: @project_members |