Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-02-16 14:00:25 +0300
committerRémy Coutable <remy@rymai.me>2018-02-27 18:02:22 +0300
commite82f629be4b9c91e2611095cd4296e487ed137ef (patch)
treefc8cb097f0b8e37c2e6fe785cf114a621e1f6b35 /app/controllers/concerns
parentbf41063679b25371b2e64542f2f469b38502edf6 (diff)
Move the #update action from Project/Member controllers to the MembershipActions concern
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/controllers/concerns')
-rw-r--r--app/controllers/concerns/membership_actions.rb12
1 files changed, 12 insertions, 0 deletions
diff --git a/app/controllers/concerns/membership_actions.rb b/app/controllers/concerns/membership_actions.rb
index a6f1509b451..82fdb797d2a 100644
--- a/app/controllers/concerns/membership_actions.rb
+++ b/app/controllers/concerns/membership_actions.rb
@@ -14,6 +14,18 @@ module MembershipActions
end
end
+ def update
+ member = membershipable.members_and_requesters.find(params[:id])
+ @member = Members::UpdateService
+ .new(membershipable, current_user, member_params)
+ .execute(member)
+ .present(current_user: current_user)
+
+ respond_to do |format|
+ format.js { render 'shared/members/update' }
+ end
+ end
+
def destroy
member = membershipable.members_and_requesters.find(params[:id])
Members::DestroyService.new(membershipable, current_user, params)