diff options
| author | Phil Hughes <me@iamphill.com> | 2016-10-06 15:30:34 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-10-06 15:30:34 +0100 |
| commit | 996e802415aa1edadb96b1f7efa924581fb047ed (patch) | |
| tree | 316dd7319d2cc723b5c311f099065e9b4fdb11d6 /app/controllers/projects/project_members_controller.rb | |
| parent | a0eaff14124b829ccc02df951bd7cb7d3abb7708 (diff) | |
| parent | dcfda304aa8c06f427cb5672ceb4e070047436be (diff) | |
| download | gitlab-ce-996e802415aa1edadb96b1f7efa924581fb047ed.tar.gz | |
Merge branch 'master' into members-ui
Diffstat (limited to 'app/controllers/projects/project_members_controller.rb')
| -rw-r--r-- | app/controllers/projects/project_members_controller.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb index b2c8656d124..67b41c4573a 100644 --- a/app/controllers/projects/project_members_controller.rb +++ b/app/controllers/projects/project_members_controller.rb @@ -59,10 +59,8 @@ class Projects::ProjectMembersController < Projects::ApplicationController end def destroy - @project_member = @project.members.find_by(id: params[:id]) || - @project.requesters.find_by(id: params[:id]) - - Members::DestroyService.new(@project_member, current_user).execute + Members::DestroyService.new(@project, current_user, params). + execute(:all) respond_to do |format| format.html do |