Merge branch 'master' into fixes/api

Conflicts: spec/requests/api/projects_spec.rb
2013-02-20 12:43:32 +01:00 · 2013-02-20 12:43:32 +01:00 · eefb27f5ae
commit eefb27f5ae
parent 1b97a2eee8 b7ac654b88
134 changed files with 1116 additions and 859 deletions
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@ -184,6 +184,7 @@ module Gitlab
      # Example Request:
      #   GET /projects/:id/hooks/:hook_id
      get ":id/hooks/:hook_id" do
+        authorize! :admin_project, user_project
        @hook = user_project.hooks.find(params[:hook_id])
        present @hook, with: Entities::Hook
      end