no more single-value merge

933b5669 · Kim "BKC" Carlbäcker · 1d7b7d88 · 933b5669
Commit 933b5669 authored Jul 07, 2017 by Kim "BKC" Carlbäcker
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

lib/gitlab_shell.rb lib/gitlab_shell.rb +1 -3

No files found.
--- 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?