Changed how collections are rendered

Used variables in haml for replicated checks
Fixed broken conflict

1 files changed, 0 insertions, 15 deletions

diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index 67b41c4573a..37a86ed0523 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -98,21 +98,6 @@ class Projects::ProjectMembersController < Projects::ApplicationController
                 notice: notice)
   end
 
-  def options
-    users = User.all
-    users = users.search(params[:search]) if params[:search].present?
-    users = users.page(1)
-
-    groups = Group.all
-    groups = groups.search(params[:search]) if params[:search].present?
-    groups = groups.page(1)
-
-    render json: {
-      Groups: groups.as_json(only: [:id, :name], methods: [:avatar_url]),
-      Users: users.as_json(only: [:id, :name, :username], methods: [:avatar_url]),
-    }
-  end
-
   protected
 
   def member_params