diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-08-08 15:31:45 +0000 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2017-08-09 14:54:02 +1000 |
| commit | 1e80f906cdef64db5060bddd64c443c5c2a56399 (patch) | |
| tree | 353b73259379fb63df7ac81a720c7b7c828c682f | |
| parent | c750fc6dcf185c6a916377579dabd0733a19ed42 (diff) | |
| download | gitlab-ce-1e80f906cdef64db5060bddd64c443c5c2a56399.tar.gz | |
Merge branch 'gitaly-bundle-gemfile' into 'master'
Unset BUNDLE_GEMFILE when installing Gitaly
See merge request !13378
| -rw-r--r-- | lib/tasks/gitlab/gitaly.rake | 2 | ||||
| -rw-r--r-- | spec/tasks/gitlab/gitaly_rake_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/tasks/gitlab/gitaly.rake b/lib/tasks/gitlab/gitaly.rake index aaf00bd703a..1f504485e4c 100644 --- a/lib/tasks/gitlab/gitaly.rake +++ b/lib/tasks/gitlab/gitaly.rake @@ -21,7 +21,7 @@ namespace :gitlab do create_gitaly_configuration # In CI we run scripts/gitaly-test-build instead of this command unless ENV['CI'].present? - Bundler.with_original_env { run_command!(%w[/usr/bin/env -u RUBYOPT] + [command]) } + Bundler.with_original_env { run_command!(%w[/usr/bin/env -u RUBYOPT -u BUNDLE_GEMFILE] + [command]) } end end end diff --git a/spec/tasks/gitlab/gitaly_rake_spec.rb b/spec/tasks/gitlab/gitaly_rake_spec.rb index cc932a4ec4c..871902a131b 100644 --- a/spec/tasks/gitlab/gitaly_rake_spec.rb +++ b/spec/tasks/gitlab/gitaly_rake_spec.rb @@ -41,7 +41,7 @@ describe 'gitlab:gitaly namespace rake task' do end describe 'gmake/make' do - let(:command_preamble) { %w[/usr/bin/env -u RUBYOPT] } + let(:command_preamble) { %w[/usr/bin/env -u RUBYOPT -u BUNDLE_GEMFILE] } before(:all) do @old_env_ci = ENV.delete('CI') |