diff --git a/app/controllers/admin/members_controller.rb b/app/controllers/admin/members_controller.rb new file mode 100644 index 0000000000000000000000000000000000000000..d920193050166e060ca30ed16b366baef63a2d85 --- /dev/null +++ b/app/controllers/admin/members_controller.rb @@ -0,0 +1,9 @@ +class Admin::MembersController < Admin::ApplicationController + def destroy + user = User.find_by_username(params[:id]) + project = Project.find_with_namespace(params[:project_id]) + project.users_projects.where(user_id: user).first.destroy + + redirect_to :back + end +end diff --git a/app/controllers/admin/projects/application_controller.rb b/app/controllers/admin/projects/application_controller.rb deleted file mode 100644 index b3f1539f38760eb94d8c1c3da0372630c645083b..0000000000000000000000000000000000000000 --- a/app/controllers/admin/projects/application_controller.rb +++ /dev/null @@ -1,11 +0,0 @@ -# Provides a base class for Admin controllers to subclass -# -# Automatically sets the layout and ensures an administrator is logged in -class Admin::Projects::ApplicationController < Admin::ApplicationController - - protected - - def project - @project ||= Project.find_with_namespace(params[:project_id]) - end -end diff --git a/app/controllers/admin/projects/members_controller.rb b/app/controllers/admin/projects/members_controller.rb deleted file mode 100644 index c7546fb6d67d1abbef278eebcd995dad340928dd..0000000000000000000000000000000000000000 --- a/app/controllers/admin/projects/members_controller.rb +++ /dev/null @@ -1,17 +0,0 @@ -class Admin::Projects::MembersController < Admin::Projects::ApplicationController - def destroy - team_member_relation.destroy - - redirect_to :back - end - - private - - def team_member - @member ||= project.users.find_by_username(params[:id]) - end - - def team_member_relation - team_member.users_projects.find_by_project_id(project) - end -end diff --git a/config/routes.rb b/config/routes.rb index c6b25e460cd3ee1444c3aaa53886af4d45eb3468..0e6454f00e74e6c0622964c1115764e1a57e0c30 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -88,9 +88,7 @@ Gitlab::Application.routes.draw do resource :background_jobs, controller: 'background_jobs', only: [:show] resources :projects, constraints: { id: /[a-zA-Z.\/0-9_\-]+/ }, only: [:index, :show] do - scope module: :projects, constraints: { id: /[a-zA-Z.\/0-9_\-]+/ } do - resources :members, only: [:destroy] - end + resources :members, only: [:destroy] end root to: "dashboard#index"