Support the fact that Gitaly uses bundler
This commit is contained in:
parent
0ed42f4b35
commit
1631ad02fd
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue