From 2abbb0980f061d4297aab02f914c324c7fbe073b Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 7 Sep 2016 14:26:07 +0100
Subject: [PATCH] Removed group members from the list for now
---
.../projects/project_members_controller.rb | 25 -------------------
1 file changed, 25 deletions(-)
diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index d49598d2786..64cbc76da6f 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -10,33 +10,8 @@ class Projects::ProjectMembersController < Projects::ApplicationController
project_members = @project.project_members
project_members = project_members.non_invite unless can?(current_user, :admin_project, @project)
- group = @project.group
-
- if group
- group_members = group.group_members
- group_members = group_members.non_invite unless can?(current_user, :admin_project, @project)
- end
-
- if params[:search].present?
- groups_id = @groups.pluck(:group_id)
- groups = Group.where(id: groups_id).search(params[:search]).to_a
- @groups = @project.project_group_links.where(group_id: groups)
-
- users = @project.users.search(params[:search]).to_a
- project_members = project_members.where(user_id: users)
-
- if group_members
- users = group.users.search(params[:search]).to_a
- group_members = group_members.where(user_id: users)
- end
- end
-
members_ids = project_members.pluck(:id)
- if group_members
- members_ids << group_members.pluck(:id)
- end
-
@members = Member.where(id: members_ids.flatten)
@members_size = @members.size
--
GitLab