summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab_shell.rb4
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?