summaryrefslogtreecommitdiff
path: root/lib/gitlab_shell.rb
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2018-08-14 00:45:54 +0100
committerNick Thomas <nick@gitlab.com>2018-08-14 00:53:42 +0100
commitc36e35c4510cf78ba3e642346bf7aa7cbc0efab3 (patch)
tree6b07ce701bf00608cb21a3c1322a15c71a48d137 /lib/gitlab_shell.rb
parentc8bf2e7d47c3b8f34cb79847edcd5dd50b8f280e (diff)
downloadgitlab-shell-c36e35c4510cf78ba3e642346bf7aa7cbc0efab3.tar.gz
Restore "Pass custom git_config_options to Gitalyo"
This reverts commit 764f6f47fa6a8698ae033532ae49875a87030518.
Diffstat (limited to 'lib/gitlab_shell.rb')
-rw-r--r--lib/gitlab_shell.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
index 78fdfe8..2057ea9 100644
--- a/lib/gitlab_shell.rb
+++ b/lib/gitlab_shell.rb
@@ -121,6 +121,7 @@ class GitlabShell # rubocop:disable Metrics/ClassLength
@git_protocol = ENV['GIT_PROTOCOL']
@gitaly = status.gitaly
@username = status.gl_username
+ @git_config_options = status.git_config_options
if defined?(@who)
@gl_id = status.gl_id
end
@@ -152,6 +153,7 @@ class GitlabShell # rubocop:disable Metrics/ClassLength
'gl_repository' => @gl_repository,
'gl_id' => @gl_id,
'gl_username' => @username,
+ 'git_config_options' => @git_config_options,
'git_protocol' => @git_protocol
}