summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMario de la Ossa <mariodelaossa@gmail.com>2018-05-21 20:59:29 -0600
committerMario de la Ossa <mariodelaossa@gmail.com>2018-05-21 20:59:29 -0600
commitcc73549b4a48d4b3d97beb29ed49185a1d1df896 (patch)
tree6f5677c65fe4e4d6ac0309e795b639d58f02c377
parentc6f72ac9a88521257991aa9a0cc6d558126f5bb9 (diff)
downloadgitlab-ce-cc73549b4a48d4b3d97beb29ed49185a1d1df896.tar.gz
Backport changes to app/controllers/groups/group_members_controller.rb
-rw-r--r--app/controllers/groups/group_members_controller.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/groups/group_members_controller.rb b/app/controllers/groups/group_members_controller.rb
index ef3eba80154..67b85205cfc 100644
--- a/app/controllers/groups/group_members_controller.rb
+++ b/app/controllers/groups/group_members_controller.rb
@@ -3,8 +3,12 @@ class Groups::GroupMembersController < Groups::ApplicationController
include MembersPresentation
include SortingHelper
+ def self.admin_required_endpoints
+ [:index, :leave, :request_access, :update, :override].freeze
+ end
+
# Authorize
- before_action :authorize_admin_group_member!, except: [:index, :leave, :request_access]
+ before_action :authorize_admin_group_member!, except: admin_required_endpoints
skip_cross_project_access_check :index, :create, :update, :destroy, :request_access,
:approve_access_request, :leave, :resend_invite,