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:
Diffstat (limited to 'lib/api/merge_request_approvals.rb')
-rw-r--r--lib/api/merge_request_approvals.rb28
1 files changed, 22 insertions, 6 deletions
diff --git a/lib/api/merge_request_approvals.rb b/lib/api/merge_request_approvals.rb
index 71ca8331ed6..7622ec717cc 100644
--- a/lib/api/merge_request_approvals.rb
+++ b/lib/api/merge_request_approvals.rb
@@ -6,10 +6,9 @@ module API
feature_category :source_code_management
- helpers do
- params :ee_approval_params do
- end
+ helpers ::API::Helpers::MergeRequestsHelpers
+ helpers do
def present_approval(merge_request)
present merge_request, with: ::API::Entities::MergeRequestApprovals, current_user: current_user
end
@@ -24,7 +23,12 @@ module API
# merge_request_iid (required) - IID of MR
# Examples:
# GET /projects/:id/merge_requests/:merge_request_iid/approvals
- desc 'List approvals for merge request'
+ desc 'List approvals for merge request' do
+ success ::API::Entities::MergeRequestApprovals
+ failure [
+ { code: 404, message: 'Not found' }
+ ]
+ end
get 'approvals', urgency: :low do
merge_request = find_merge_request_with_access(params[:merge_request_iid])
@@ -39,7 +43,13 @@ module API
# Examples:
# POST /projects/:id/merge_requests/:merge_request_iid/approve
#
- desc 'Approve a merge request'
+ desc 'Approve a merge request' do
+ success code: 201, model: ::API::Entities::MergeRequestApprovals
+ failure [
+ { code: 404, message: 'Not found' },
+ { code: 401, message: 'Unauthorized' }
+ ]
+ end
params do
optional :sha, type: String, desc: 'When present, must have the HEAD SHA of the source branch'
@@ -60,7 +70,13 @@ module API
present_approval(merge_request)
end
- desc 'Remove an approval from a merge request'
+ desc 'Remove an approval from a merge request' do
+ success code: 201, model: ::API::Entities::MergeRequestApprovals
+ failure [
+ { code: 404, message: 'Not found' },
+ { code: 401, message: 'Unauthorized' }
+ ]
+ end
post 'unapprove', urgency: :low do
merge_request = find_merge_request_with_access(params[:merge_request_iid], :approve_merge_request)