diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-08-14 00:45:54 +0100 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-08-14 00:53:42 +0100 |
| commit | c36e35c4510cf78ba3e642346bf7aa7cbc0efab3 (patch) | |
| tree | 6b07ce701bf00608cb21a3c1322a15c71a48d137 /lib | |
| parent | c8bf2e7d47c3b8f34cb79847edcd5dd50b8f280e (diff) | |
| download | gitlab-shell-c36e35c4510cf78ba3e642346bf7aa7cbc0efab3.tar.gz | |
Restore "Pass custom git_config_options to Gitalyo"
This reverts commit 764f6f47fa6a8698ae033532ae49875a87030518.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab_access_status.rb | 6 | ||||
| -rw-r--r-- | lib/gitlab_net.rb | 1 | ||||
| -rw-r--r-- | lib/gitlab_shell.rb | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/lib/gitlab_access_status.rb b/lib/gitlab_access_status.rb index c639462..afb5a9e 100644 --- a/lib/gitlab_access_status.rb +++ b/lib/gitlab_access_status.rb @@ -1,14 +1,15 @@ require 'json' class GitAccessStatus - attr_reader :message, :gl_repository, :gl_id, :gl_username, :repository_path, :gitaly, :git_protocol + attr_reader :message, :gl_repository, :gl_id, :gl_username, :repository_path, :gitaly, :git_protocol, :git_config_options - def initialize(status, message, gl_repository:, gl_id:, gl_username:, repository_path:, gitaly:, git_protocol:) + def initialize(status, message, gl_repository:, gl_id:, gl_username:, repository_path:, gitaly:, git_protocol:, git_config_options:) @status = status @message = message @gl_repository = gl_repository @gl_id = gl_id @gl_username = gl_username + @git_config_options = git_config_options @repository_path = repository_path @gitaly = gitaly @git_protocol = git_protocol @@ -21,6 +22,7 @@ class GitAccessStatus gl_repository: values["gl_repository"], gl_id: values["gl_id"], gl_username: values["gl_username"], + git_config_options: values["git_config_options"], repository_path: values["repository_path"], gitaly: values["gitaly"], git_protocol: values["git_protocol"]) diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb index 9cb7e56..28d1f0d 100644 --- a/lib/gitlab_net.rb +++ b/lib/gitlab_net.rb @@ -43,6 +43,7 @@ class GitlabNet # rubocop:disable Metrics/ClassLength gl_repository: nil, gl_id: nil, gl_username: nil, + git_config_options: nil, repository_path: nil, gitaly: nil, git_protocol: nil) 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 } |