diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-28 09:20:37 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-28 09:20:37 +0000 |
commit | ba81e6defba49ebc0ff360a2bae888336673f5a5 (patch) | |
tree | 1ad0890b811649c47c6184a233a185f3b0322b83 /lib | |
parent | 81e406d2f020635f42ac85de8c191c515a15807f (diff) | |
parent | 1631ad02fd32f2fb620ba3fa13f0504ae5181356 (diff) | |
download | gitlab-ce-ba81e6defba49ebc0ff360a2bae888336673f5a5.tar.gz |
Merge branch 'gitaly-ruby-bundler' into 'master'
Support the fact that Gitaly uses bundler
See merge request !13135
Diffstat (limited to 'lib')
-rw-r--r-- | lib/tasks/gitlab/gitaly.rake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tasks/gitlab/gitaly.rake b/lib/tasks/gitlab/gitaly.rake index a8db5701d0b..9df07ea8d83 100644 --- a/lib/tasks/gitlab/gitaly.rake +++ b/lib/tasks/gitlab/gitaly.rake @@ -19,7 +19,7 @@ namespace :gitlab do Dir.chdir(args.dir) do create_gitaly_configuration - run_command!([command]) + Bundler.with_original_env { run_command!([command]) } end end |