summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2014-10-21 14:24:28 +0300
committerValery Sizov <valery@gitlab.com>2014-10-21 14:24:28 +0300
commita443c4c88f8aaabfe513c8c469452e33363a0b74 (patch)
treee3237d8cdace2e6f9b2e8e85d2a9412854d22486
parentfbe9b00fc9304f3e4a98192be99a7dce17ae08a0 (diff)
parentd29dd2cfecfbf97bf5837dba3791c0ed058a5a1a (diff)
downloadgitlab-ce-a443c4c88f8aaabfe513c8c469452e33363a0b74.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
-rw-r--r--lib/gitlab/backend/grack_auth.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/backend/grack_auth.rb b/lib/gitlab/backend/grack_auth.rb
index c2f3b851c07..df1461a45c9 100644
--- a/lib/gitlab/backend/grack_auth.rb
+++ b/lib/gitlab/backend/grack_auth.rb
@@ -90,7 +90,7 @@ module Grack
when *Gitlab::GitAccess::PUSH_COMMANDS
if user
# Skip user authorization on upload request.
- # It will be serverd by update hook in repository
+ # It will be done by the pre-receive hook in the repository.
true
else
false