summaryrefslogtreecommitdiff
path: root/app/controllers/groups_controller.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-03-13 16:27:51 +0100
committerDouwe Maan <douwe@gitlab.com>2015-03-15 13:51:11 +0100
commit224187ffb96283cbf42953a30c116931c03562a2 (patch)
tree43664fc3c80830c50dc11d64eb7b000ae2492ff1 /app/controllers/groups_controller.rb
parent75aff0f79c73ccc430a8c92b2317d114a5c8b24d (diff)
downloadgitlab-ce-224187ffb96283cbf42953a30c116931c03562a2.tar.gz
Move group members index from `/members` to `/group_members`.
Diffstat (limited to 'app/controllers/groups_controller.rb')
-rw-r--r--app/controllers/groups_controller.rb15
1 files changed, 1 insertions, 14 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 7e336803fbb..7af3c077182 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -1,5 +1,5 @@
class GroupsController < Groups::ApplicationController
- skip_before_filter :authenticate_user!, only: [:show, :issues, :members, :merge_requests]
+ skip_before_filter :authenticate_user!, only: [:show, :issues, :merge_requests]
respond_to :html
before_filter :group, except: [:new, :create]
@@ -67,19 +67,6 @@ class GroupsController < Groups::ApplicationController
end
end
- def members
- @project = group.projects.find(params[:project_id]) if params[:project_id]
- @members = group.group_members
-
- if params[:search].present?
- users = group.users.search(params[:search]).to_a
- @members = @members.where(user_id: users)
- end
-
- @members = @members.order('access_level DESC').page(params[:page]).per(50)
- @users_group = GroupMember.new
- end
-
def edit
end