diff options
| author | James Lopez <james@jameslopez.es> | 2016-06-16 15:01:27 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-06-16 15:01:27 +0200 |
| commit | b3a0a1c3155702e2deddade0fea3e79087b40da4 (patch) | |
| tree | 096bf8b46f1d9dc4be16cf29551a27d8fd6c8d7b /lib/gitlab/workhorse.rb | |
| parent | 8ac52f49c024775311a0736ddad964e85c8f6ed2 (diff) | |
| parent | 2a747d386dbdc05453fce6b8be3f483e8cd9e796 (diff) | |
| download | gitlab-ce-b3a0a1c3155702e2deddade0fea3e79087b40da4.tar.gz | |
fixed merge conflicts on UI branch
Diffstat (limited to 'lib/gitlab/workhorse.rb')
| -rw-r--r-- | lib/gitlab/workhorse.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb index 388f84dbe0e..40e8299c36b 100644 --- a/lib/gitlab/workhorse.rb +++ b/lib/gitlab/workhorse.rb @@ -8,7 +8,7 @@ module Gitlab class << self def git_http_ok(repository, user) { - 'GL_ID' => Gitlab::ShellEnv.gl_id(user), + 'GL_ID' => Gitlab::GlId.gl_id(user), 'RepoPath' => repository.path_to_repo, } end |