Merge branch 'master' into api/system_hooks_adjustments

2013-03-07 17:59:27 +01:00 · 2013-03-07 17:59:27 +01:00 · 562de2a438
commit 562de2a438
parent 32f1eaaf0f a7055be1fd
2 changed files with 52 additions and 28 deletions
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@ -20,6 +20,9 @@ module Gitlab
          project == key.project && git_cmd == 'git-upload-pack'
        else
          user = key.user
+
+          return false if user.blocked?
+
          action = case git_cmd
                   when 'git-upload-pack'
                     then :download_code