diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-08-03 11:36:41 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-08-03 11:36:41 +0000 |
| commit | 23c502b43404aa70741462da5d57c23196f6088a (patch) | |
| tree | 0c2b5ed1c25548d67555e9309f59d1af542248c8 /lib | |
| parent | 1018ab0516fd94d1ffbc05a0ad8499947dd9630d (diff) | |
| parent | 532ad2e56e10ff0e7922980d48a8c639efac8809 (diff) | |
| download | gitlab-ce-23c502b43404aa70741462da5d57c23196f6088a.tar.gz | |
Merge branch 'fix-gitaly-install' into 'master'
Ensure we run installation Rake tasks in a clean env in TestEnv
Closes #35859
See merge request !13249
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 680e76af471..3703f9cfb5c 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 BUNDLE_GEMFILE] + [command]) } + Bundler.with_original_env { run_command!([command]) } end end end |