diff options
| author | GitLab <example@example.com> | 2015-07-28 15:55:53 +0200 |
|---|---|---|
| committer | GitLab <example@example.com> | 2015-07-28 15:55:53 +0200 |
| commit | 6912f21e5c9dd812286fce156534ebc094466e17 (patch) | |
| tree | 903d54db36b3dc866489669229b58bdac31bb54a | |
| parent | ae9e5eea3c6955d278182005808fbdfccd4d447b (diff) | |
| download | gitlab-ce-6912f21e5c9dd812286fce156534ebc094466e17.tar.gz | |
Send GL_ID to gitlab-git-http-server as JSON
| -rw-r--r-- | lib/gitlab/backend/grack_auth.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/gitlab/backend/grack_auth.rb b/lib/gitlab/backend/grack_auth.rb index 5966d394b62..e8cb0c77fb4 100644 --- a/lib/gitlab/backend/grack_auth.rb +++ b/lib/gitlab/backend/grack_auth.rb @@ -181,11 +181,12 @@ module Grack def render_grack_auth_ok if @user.present? - body = Gitlab::ShellEnv.gl_id(@user) + gl_id = Gitlab::ShellEnv.gl_id(@user) else - body = '' + gl_id = '' end - [200, { "Content-Type" => "text/plain" }, [body]] + + [200, { "Content-Type" => "application/json" }, [JSON.dump({'GL_ID' => gl_id})]] end def render_not_found |