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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
6c5b2377
Commit
6c5b2377
authored
Jun 17, 2016
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use the new Members::DestroyService in group/project member controllers
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
4652489f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/controllers/groups/group_members_controller.rb
app/controllers/groups/group_members_controller.rb
+1
-1
app/controllers/projects/project_members_controller.rb
app/controllers/projects/project_members_controller.rb
+1
-1
No files found.
app/controllers/groups/group_members_controller.rb
View file @
6c5b2377
...
@@ -38,7 +38,7 @@ class Groups::GroupMembersController < Groups::ApplicationController
...
@@ -38,7 +38,7 @@ class Groups::GroupMembersController < Groups::ApplicationController
return
render_403
unless
can?
(
current_user
,
:destroy_group_member
,
@group_member
)
return
render_403
unless
can?
(
current_user
,
:destroy_group_member
,
@group_member
)
@group_member
.
destroy
Members
::
DestroyService
.
new
(
@group_member
,
current_user
).
execute
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
{
redirect_to
group_group_members_path
(
@group
),
notice:
'User was successfully removed from group.'
}
format
.
html
{
redirect_to
group_group_members_path
(
@group
),
notice:
'User was successfully removed from group.'
}
...
...
app/controllers/projects/project_members_controller.rb
View file @
6c5b2377
...
@@ -52,7 +52,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
...
@@ -52,7 +52,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
return
render_403
unless
can?
(
current_user
,
:destroy_project_member
,
@project_member
)
return
render_403
unless
can?
(
current_user
,
:destroy_project_member
,
@project_member
)
@project_member
.
destroy
Members
::
DestroyService
.
new
(
@project_member
,
current_user
).
execute
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
do
format
.
html
do
...
...
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