Merge branch 'master' into fixes/api, code clean up and tests fixed

Conflicts: doc/api/projects.md spec/requests/api/projects_spec.rb
2013-03-07 14:51:56 +01:00 · 2013-03-07 14:51:56 +01:00 · 3374027e3a
commit 3374027e3a
parent 39114d259c 9c2a6e2013
49 changed files with 820 additions and 163 deletions
--- a/lib/api.rb
+++ b/lib/api.rb
@ -33,5 +33,6 @@ module Gitlab
    mount MergeRequests
    mount Notes
    mount Internal
+    mount SystemHooks
  end
 end