summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/backend/grack_auth.rb11
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/gitlab/backend/grack_auth.rb b/lib/gitlab/backend/grack_auth.rb
index f7fc97651f2..5966d394b62 100644
--- a/lib/gitlab/backend/grack_auth.rb
+++ b/lib/gitlab/backend/grack_auth.rb
@@ -28,7 +28,7 @@ module Grack
if project && authorized_request?
if ENV['GITLAB_GRACK_AUTH_ONLY'] == '1'
# Tell gitlab-git-http-server the request is OK, and what the GL_ID is
- [200, { "Content-Type" => "text/plain" }, [Gitlab::ShellEnv.gl_id(@user)]]
+ render_grack_auth_ok
else
@app.call(env)
end
@@ -179,6 +179,15 @@ module Grack
end
end
+ def render_grack_auth_ok
+ if @user.present?
+ body = Gitlab::ShellEnv.gl_id(@user)
+ else
+ body = ''
+ end
+ [200, { "Content-Type" => "text/plain" }, [body]]
+ end
+
def render_not_found
[404, { "Content-Type" => "text/plain" }, ["Not Found"]]
end