summaryrefslogtreecommitdiff
path: root/lib/api/project_milestones.rb
diff options
context:
space:
mode:
authorTiago Botelho <tiagonbotelho@hotmail.com>2018-01-25 09:47:36 +0000
committerTiago Botelho <tiagonbotelho@hotmail.com>2018-01-25 10:00:17 +0000
commit4903ff93971d28723ed9d81f7dae2ad2a1d5586a (patch)
tree8f6f5cbc302f0820c1ffd0c85528388fd33bb8d7 /lib/api/project_milestones.rb
parent3805cd7ac5e1c9b286bfba667ef45972eab4d084 (diff)
parent944c1eb684fe979339262ba6e9f7bf9e1b77fc81 (diff)
downloadgitlab-ce-13931-custom-emoji-implementation.tar.gz
Merge branch 'master' into 13931-custom-emoji-implementation13931-custom-emoji-implementation
Conflicts: app/assets/javascripts/dispatcher.js app/assets/javascripts/pages/projects/shared/project_avatar.js
Diffstat (limited to 'lib/api/project_milestones.rb')
-rw-r--r--lib/api/project_milestones.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/api/project_milestones.rb b/lib/api/project_milestones.rb
index 0cb209a02d0..306dc0e63d7 100644
--- a/lib/api/project_milestones.rb
+++ b/lib/api/project_milestones.rb
@@ -60,6 +60,15 @@ module API
update_milestone_for(user_project)
end
+ desc 'Remove a project milestone'
+ delete ":id/milestones/:milestone_id" do
+ authorize! :admin_milestone, user_project
+
+ user_project.milestones.find(params[:milestone_id]).destroy
+
+ status(204)
+ end
+
desc 'Get all issues for a single project milestone' do
success Entities::IssueBasic
end