diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-02-14 14:00:02 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-02-14 14:00:02 +0200 |
| commit | b698094d4dcd1558bfcc1611d3572297dd11ae1e (patch) | |
| tree | 2be71177fb83cce5f67df1683d56d9f7b3737a03 /lib | |
| parent | ed3f44085e01f50864ce840f007a50d2154df6f5 (diff) | |
| download | gitlab-ce-b698094d4dcd1558bfcc1611d3572297dd11ae1e.tar.gz | |
Update post-receive worker to use correct identifier
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/backend/grack_auth.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/gitlab/backend/grack_auth.rb b/lib/gitlab/backend/grack_auth.rb index a2d15d57034..8fcafe4ea9d 100644 --- a/lib/gitlab/backend/grack_auth.rb +++ b/lib/gitlab/backend/grack_auth.rb @@ -7,9 +7,6 @@ module Grack @request = Rack::Request.new(env) @auth = Request.new(env) - # Pass Gitolite update hook - ENV['GL_BYPASS_UPDATE_HOOK'] = "true" - # Need this patch due to the rails mount @env['PATH_INFO'] = @request.path @env['SCRIPT_NAME'] = "" @@ -35,8 +32,8 @@ module Grack self.user = User.find_by_email(login) || User.find_by_username(login) return false unless user.try(:valid_password?, password) - # Set GL_USER env variable - ENV['GL_USER'] = user.email + # Set GL_ID env variable + ENV['GL_ID'] = "user-#{user.id}" end # Git upload and receive |