summaryrefslogtreecommitdiff
path: root/app/controllers/concerns/membership_actions.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-07-28 19:30:34 +0200
committerRémy Coutable <remy@rymai.me>2016-09-22 15:50:47 +0200
commitb3f0a82f501ce26717a6f9e57d91cb2b1f1a967b (patch)
treed4eabb5b40c1140fd6619084ff11e849d44eb7db /app/controllers/concerns/membership_actions.rb
parent8071dc83fa00361b7bdee6e76ef2d4a59851b154 (diff)
downloadgitlab-ce-b3f0a82f501ce26717a6f9e57d91cb2b1f1a967b.tar.gz
New Members::ApproveAccessRequestService
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/controllers/concerns/membership_actions.rb')
-rw-r--r--app/controllers/concerns/membership_actions.rb7
1 files changed, 1 insertions, 6 deletions
diff --git a/app/controllers/concerns/membership_actions.rb b/app/controllers/concerns/membership_actions.rb
index 52682ef9dc9..ba7c02b0ba7 100644
--- a/app/controllers/concerns/membership_actions.rb
+++ b/app/controllers/concerns/membership_actions.rb
@@ -1,6 +1,5 @@
module MembershipActions
extend ActiveSupport::Concern
- include MembersHelper
def request_access
membershipable.request_access(current_user)
@@ -10,11 +9,7 @@ module MembershipActions
end
def approve_access_request
- @member = membershipable.requesters.find(params[:id])
-
- return render_403 unless can?(current_user, action_member_permission(:update, @member), @member)
-
- @member.accept_request
+ Members::ApproveAccessRequestService.new(membershipable, current_user, user_id: params[:id]).execute
redirect_to polymorphic_url([membershipable, :members])
end