diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-09-09 19:06:36 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-09-22 16:50:48 +0300 |
| commit | 5dcdf1d51bbd5bde4ea9417dd4402571608c90f0 (patch) | |
| tree | ef7617be280bdf72718d4ef806cc45a3fddbeea7 /app/services/members | |
| parent | b3f0a82f501ce26717a6f9e57d91cb2b1f1a967b (diff) | |
Ensure Members::ApproveAccessRequestService can fin a requester by ID
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/services/members')
| -rw-r--r-- | app/services/members/approve_access_request_service.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/members/approve_access_request_service.rb b/app/services/members/approve_access_request_service.rb index 0324f0bb4bd..c05d061b6a0 100644 --- a/app/services/members/approve_access_request_service.rb +++ b/app/services/members/approve_access_request_service.rb @@ -11,7 +11,8 @@ module Members end def execute - access_requester = source.requesters.find_by!(user_id: params[:user_id]) + condition = params[:user_id] ? { user_id: params[:user_id] } : { id: params[:id] } + access_requester = source.requesters.find_by!(condition) raise Gitlab::Access::AccessDeniedError if cannot_update_access_requester?(access_requester) |