From c36e35c4510cf78ba3e642346bf7aa7cbc0efab3 Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Tue, 14 Aug 2018 00:45:54 +0100
Subject: Restore "Pass custom git_config_options to Gitalyo"

This reverts commit 764f6f47fa6a8698ae033532ae49875a87030518.
---
 lib/gitlab_shell.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib/gitlab_shell.rb')

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
       }
 
-- 
cgit v1.2.1