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

Support the fact that Gitaly uses bundler

See merge request !13135

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
 

spec/support/test_env.rb

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