diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-09-27 12:10:12 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-09-27 12:10:12 +0000 |
| commit | 166c6cd85c2be13bb2fa5d27f40d304ffd9c62ad (patch) | |
| tree | 1e7b527ab4b646d06ecf0f22ccf92150e65e3f25 /lib/api | |
| parent | f4f06d002b557044c076cddf4838866858b40279 (diff) | |
| parent | 94996963c594b673f8c380e3e06fd3fbdd1ce105 (diff) | |
| download | gitlab-ce-166c6cd85c2be13bb2fa5d27f40d304ffd9c62ad.tar.gz | |
Merge branch 'rc-new-members-approve-request-access-service' into 'master'
New `Members::ApproveAccessRequestService`
Part of #21979.
## Does this MR meet the acceptance criteria?
- [x] API support added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !6266
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/access_requests.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/api/access_requests.rb b/lib/api/access_requests.rb index 29a97ccbd75..9d1d9058996 100644 --- a/lib/api/access_requests.rb +++ b/lib/api/access_requests.rb @@ -55,13 +55,8 @@ module API put ':id/access_requests/:user_id/approve' do required_attributes! [:user_id] source = find_source(source_type, params[:id]) - authorize_admin_source!(source_type, source) - member = source.requesters.find_by!(user_id: params[:user_id]) - if params[:access_level] - member.update(access_level: params[:access_level]) - end - member.accept_request + member = ::Members::ApproveAccessRequestService.new(source, current_user, params).execute status :created present member.user, with: Entities::Member, member: member |