From 933b56691d4b95b642c19d91cbeccb098d3a1696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kim=20=22BKC=22=20Carlb=C3=A4cker?= Date: Fri, 7 Jul 2017 18:27:58 +0200 Subject: no more single-value merge --- lib/gitlab_shell.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'lib/gitlab_shell.rb') 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? -- cgit v1.2.1