diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2017-07-27 16:35:40 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2017-07-27 16:35:40 +0200 |
| commit | 1631ad02fd32f2fb620ba3fa13f0504ae5181356 (patch) | |
| tree | 609e92cc0539c9bad4225bedc5da82645ded6398 | |
| parent | 0ed42f4b3534e652c91e6628c43e09be67423301 (diff) | |
| download | gitlab-ce-1631ad02fd32f2fb620ba3fa13f0504ae5181356.tar.gz | |
Support the fact that Gitaly uses bundler
| -rw-r--r-- | lib/tasks/gitlab/gitaly.rake | 2 | ||||
| -rw-r--r-- | spec/support/test_env.rb | 2 |
2 files changed, 2 insertions, 2 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 diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index c32c05b03e2..3da1b940b0d 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -146,7 +146,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 |