diff options
author | Phil Hughes <me@iamphill.com> | 2016-10-06 15:41:00 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-10-06 15:41:00 +0100 |
commit | 6865c46c6649118e09e60dd29dfa060470010aa9 (patch) | |
tree | b5ab32dd1311bc46b678fb442b91f347f3348630 /app/controllers/projects/project_members_controller.rb | |
parent | 996e802415aa1edadb96b1f7efa924581fb047ed (diff) | |
download | gitlab-ce-6865c46c6649118e09e60dd29dfa060470010aa9.tar.gz |
Changed how collections are rendered
Used variables in haml for replicated checks
Fixed broken conflict
Diffstat (limited to 'app/controllers/projects/project_members_controller.rb')
-rw-r--r-- | app/controllers/projects/project_members_controller.rb | 15 |
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 |