diff options
| author | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2017-07-07 18:27:58 +0200 |
|---|---|---|
| committer | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2017-07-07 18:27:58 +0200 |
| commit | 933b56691d4b95b642c19d91cbeccb098d3a1696 (patch) | |
| tree | b8263ad398d07242f5c81c6e7ff989ae374d6f6b | |
| parent | 1d7b7d881da96169ae99cf868200e478dfde7c8f (diff) | |
| download | gitlab-shell-933b56691d4b95b642c19d91cbeccb098d3a1696.tar.gz | |
no more single-value merge
| -rw-r--r-- | lib/gitlab_shell.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb index e71b418..262f9f7 100644 --- a/lib/gitlab_shell.rb +++ b/lib/gitlab_shell.rb @@ -156,9 +156,7 @@ class GitlabShell 'GL_REPOSITORY' => @gl_repository } if @gitaly && @gitaly.include?('token') - env.merge!({ - 'GITALY_TOKEN' => @gitaly['token'] - }) + env['GITALY_TOKEN'] = @gitaly['token'] end if git_trace_available? |