Commit ba81e6de authored by Sean McGivern's avatar Sean McGivern

Merge branch 'gitaly-ruby-bundler' into 'master'

Support the fact that Gitaly uses bundler

See merge request !13135
parents 81e406d2 1631ad02
...@@ -19,7 +19,7 @@ namespace :gitlab do ...@@ -19,7 +19,7 @@ namespace :gitlab do
Dir.chdir(args.dir) do Dir.chdir(args.dir) do
create_gitaly_configuration create_gitaly_configuration
run_command!([command]) Bundler.with_original_env { run_command!([command]) }
end end
end end
......
...@@ -147,7 +147,7 @@ module TestEnv ...@@ -147,7 +147,7 @@ module TestEnv
gitaly_exec = File.join(gitaly_dir, 'gitaly') gitaly_exec = File.join(gitaly_dir, 'gitaly')
gitaly_config = File.join(gitaly_dir, 'config.toml') gitaly_config = File.join(gitaly_dir, 'config.toml')
log_file = Rails.root.join('log/gitaly-test.log').to_s 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 end
def stop_gitaly def stop_gitaly
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment