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

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

Browse source 
Support the fact that Gitaly uses bundler

See merge request !13135
This commit is contained in:
Sean McGivern 2017-07-28 09:20:37 +00:00
commit ba81e6defb
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
create_gitaly_configuration
run_command!([command])
Bundler.with_original_env { run_command!([command]) }
end
end

2
spec/support/test_env.rb
View file

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