deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into fixes/api

Browse source 
Conflicts:
	spec/requests/api/projects_spec.rb
This commit is contained in:
Sebastian Ziebell 2013-02-20 14:30:11 +01:00
commit f0e417091c
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/api/projects.rb
View file

@ -244,8 +244,8 @@ module Gitlab
# id (required) - The ID of a project
# hook_id (required) - The ID of hook to delete
# Example Request:
# DELETE /projects/:id/hooks
delete ":id/hooks" do
# DELETE /projects/:id/hooks/:hook_id
delete ":id/hooks/:hook_id" do
authorize! :admin_project, user_project
bad_request!(:hook_id) unless params.has_key? :hook_id