kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Support the fact that Gitaly uses bundler

This commit is contained in:
Jacob Vosmaer 2017-07-27 16:35:40 +02:00
parent 0ed42f4b35
commit 1631ad02fd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tasks/gitlab/gitaly.rake
View File

@ -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

2
spec/support/test_env.rb
View File

@ -146,7 +146,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