diff options
| author | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-20 14:30:11 +0100 |
|---|---|---|
| committer | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-20 14:30:11 +0100 |
| commit | f0e417091c2cef32b560472a38f66cf6cdcaec15 (patch) | |
| tree | 1b4a06460786d2c9e35057ac9e5c1b54b2bef356 /lib | |
| parent | 512d826cc3e89bb577f485d4767d91185f3f0556 (diff) | |
| parent | ba1a453ef3dddf50a2c118f4490267b19a0b2cc8 (diff) | |
| download | gitlab-ce-f0e417091c2cef32b560472a38f66cf6cdcaec15.tar.gz | |
Merge branch 'master' into fixes/api
Conflicts:
spec/requests/api/projects_spec.rb
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/projects.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/projects.rb b/lib/api/projects.rb index d171acc1ce1..65381dac6ac 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -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 |