diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-03-13 16:16:51 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-03-15 13:49:41 +0100 |
commit | 99f995755ef4b445216dd7baae35f5a4846ef30c (patch) | |
tree | 1fdbd02c7cffc2f21faefaa80dea43f6cebecb0a /app/controllers/groups | |
parent | 60df262c38d7c235b483cc1c4beb12f793e0e58a (diff) | |
download | gitlab-ce-99f995755ef4b445216dd7baae35f5a4846ef30c.tar.gz |
Use `group_member` instead of `users_group` or `membership`.
Diffstat (limited to 'app/controllers/groups')
-rw-r--r-- | app/controllers/groups/group_members_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/groups/group_members_controller.rb b/app/controllers/groups/group_members_controller.rb index b083cf5d8c5..132452d61c9 100644 --- a/app/controllers/groups/group_members_controller.rb +++ b/app/controllers/groups/group_members_controller.rb @@ -18,10 +18,10 @@ class Groups::GroupMembersController < Groups::ApplicationController end def destroy - @users_group = @group.group_members.find(params[:id]) + @group_member = @group.group_members.find(params[:id]) - if can?(current_user, :destroy, @users_group) # May fail if last owner. - @users_group.destroy + if can?(current_user, :destroy_group_member, @group_member) # May fail if last owner. + @group_member.destroy respond_to do |format| format.html { redirect_to members_group_path(@group), notice: 'User was successfully removed from group.' } format.js { render nothing: true } |