Commit b76dfe8b authored by Stan Hu's avatar Stan Hu

Resolve conflict in app/services/members/approve_access_request_service.rb

parent bb516340
module Members
class ApproveAccessRequestService < Members::BaseService
<<<<<<< HEAD
prepend EE::Members::ApproveAccessRequestService
=======
>>>>>>> upstream/master
def execute(access_requester, skip_authorization: false, skip_log_audit_event: false)
raise Gitlab::Access::AccessDeniedError unless skip_authorization || can_update_access_requester?(access_requester)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment