diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-08-14 00:22:29 +0100 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-08-14 00:22:29 +0100 |
| commit | 764f6f47fa6a8698ae033532ae49875a87030518 (patch) | |
| tree | 286fc49fbbc22fc3314343794c86e98e1ad8bbe5 /lib | |
| parent | 2dcf8b77a61c4c7cfebe8ae13f8112a0471056b0 (diff) | |
| download | gitlab-shell-764f6f47fa6a8698ae033532ae49875a87030518.tar.gz | |
Revert "Pass custom git_config_options to Gitalyo"
This reverts commit f4ce4a3c31a9a7fb2fa0bb7daa185d34b8c03c00.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/action/gitaly.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/action/gitaly.rb b/lib/action/gitaly.rb index 6630b1d..b95ff17 100644 --- a/lib/action/gitaly.rb +++ b/lib/action/gitaly.rb @@ -11,11 +11,10 @@ module Action 'git-receive-pack' => File.join(ROOT_PATH, 'bin', 'gitaly-receive-pack') }.freeze - def initialize(actor, gl_repository, gl_username, git_config_options, git_protocol, repository_path, gitaly) + def initialize(actor, gl_repository, gl_username, git_protocol, repository_path, gitaly) @actor = actor @gl_repository = gl_repository @gl_username = gl_username - @git_config_options = git_config_options @git_protocol = git_protocol @repository_path = repository_path @gitaly = gitaly @@ -25,7 +24,6 @@ module Action new(actor, json['gl_repository'], json['gl_username'], - json['git_config_options'], json['git_protocol'], json['repository_path'], json['gitaly']) @@ -41,7 +39,7 @@ module Action private - attr_reader :actor, :gl_repository, :gl_username, :git_config_options, :repository_path, :gitaly + attr_reader :actor, :gl_repository, :gl_username, :repository_path, :gitaly def git_protocol @git_protocol || ENV['GIT_PROTOCOL'] # TODO: tidy this up @@ -100,7 +98,6 @@ module Action 'gl_repository' => gl_repository, 'gl_id' => actor.identifier, 'gl_username' => gl_username, - 'git_config_options' => git_config_options, 'git_protocol' => git_protocol } end |