Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
747807fa
Commit
747807fa
authored
Nov 19, 2015
by
Robert Speicher
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'ce/8-2-stable' into ce-stable-to-ee-stable
parents
37fc82ac
9535d91e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
2 deletions
+0
-2
app/controllers/groups/group_members_controller.rb
app/controllers/groups/group_members_controller.rb
+0
-2
No files found.
app/controllers/groups/group_members_controller.rb
View file @
747807fa
...
...
@@ -52,7 +52,6 @@ class Groups::GroupMembersController < Groups::ApplicationController
return
render_403
unless
can?
(
current_user
,
:destroy_group_member
,
@group_member
)
@group_member
.
destroy
log_audit_event
(
@group_member
,
action: :destroy
)
respond_to
do
|
format
|
...
...
@@ -80,7 +79,6 @@ class Groups::GroupMembersController < Groups::ApplicationController
if
can?
(
current_user
,
:destroy_group_member
,
@group_member
)
@group_member
.
destroy
log_audit_event
(
@group_member
,
action: :destroy
)
redirect_to
(
dashboard_groups_path
,
notice:
"You left
#{
group
.
name
}
group."
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment