diff options
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/issues.rb | 9 | ||||
| -rw-r--r-- | lib/api/merge_requests.rb | 14 |
2 files changed, 21 insertions, 2 deletions
diff --git a/lib/api/issues.rb b/lib/api/issues.rb index fda6f841438..5b47bbc0b1b 100644 --- a/lib/api/issues.rb +++ b/lib/api/issues.rb @@ -191,7 +191,7 @@ module API end end - # Delete a project issue (deprecated) + # Delete a project issue # # Parameters: # id (required) - The ID of a project @@ -199,7 +199,12 @@ module API # Example Request: # DELETE /projects/:id/issues/:issue_id delete ":id/issues/:issue_id" do - not_allowed! + authenticated_as_admin! + + issue = user_project.issues.find(params[:issue_id]) + issue.destroy + + present issue, with: Entities::Issue end end end diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index c5e5d57ed4d..09ce02b0912 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -100,6 +100,20 @@ module API end end + # Delete a MR + # + # Parameters: + # id (required) - The ID of the project + # merge_request_id (required) - The MR id + delete ":id/merge_requests/:merge_request_id" do + authenticated_as_admin! + + merge_request = user_project.merge_requests.find(params[:merge_request_id]) + merge_request.destroy + + present merge_request, with: Entities::MergeRequest + end + # Routing "merge_request/:merge_request_id/..." is DEPRECATED and WILL BE REMOVED in version 9.0 # Use "merge_requests/:merge_request_id/..." instead. # |