Merge branch 'master' into fixes/api

2013-02-27 10:16:48 +01:00 · 2013-02-27 10:16:48 +01:00 · ac4a09e9cc
commit ac4a09e9cc
parent 9ee6c58acc 135418dcbf
94 changed files with 935 additions and 731 deletions
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@ -5,6 +5,12 @@ module Gitlab
      #
      # Check if ssh key has access to project code
      #
+      # Params:
+      #   key_id - SSH Key id
+      #   project - project path with namespace
+      #   action - git action (git-upload-pack or git-receive-pack)
+      #   ref - branch name
+      #
      get "/allowed" do
        key = Key.find(params[:key_id])
        project = Project.find_with_namespace(params[:project])