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 /spec | |
| 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 'spec')
| -rw-r--r-- | spec/support/test_env.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 7682bdf8cd0..86f9568c12e 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -147,7 +147,7 @@ module TestEnv gitaly_exec = File.join(gitaly_dir, 'gitaly') gitaly_config = File.join(gitaly_dir, 'config.toml') log_file = Rails.root.join('log/gitaly-test.log').to_s - @gitaly_pid = spawn(gitaly_exec, gitaly_config, [:out, :err] => log_file) + @gitaly_pid = Bundler.with_original_env { spawn(gitaly_exec, gitaly_config, [:out, :err] => log_file) } end def stop_gitaly |