diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-08-08 15:31:45 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-08-08 15:31:45 +0000 |
| commit | 97f60b49cc915b8756c3407a0ff303dfb266551b (patch) | |
| tree | 5def2c46e6d05d78c2154402c6239ea98605ff46 /lib | |
| parent | 143b5293b0e7f6fb4df64f5bc0b600d72aa6bbb1 (diff) | |
| parent | 5684528081d0ffef9f128cd1b102889f23075dd0 (diff) | |
| download | gitlab-ce-97f60b49cc915b8756c3407a0ff303dfb266551b.tar.gz | |
Merge branch 'gitaly-bundle-gemfile' into 'master'
Unset BUNDLE_GEMFILE when installing Gitaly
See merge request !13378
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tasks/gitlab/gitaly.rake | 2 |
1 files changed, 1 insertions, 1 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 |