diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-08-04 15:59:30 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-08-04 15:59:30 +0200 |
| commit | 805a28e6a134b59ab3efa3ff6d6b0e16bd24c950 (patch) | |
| tree | f8079eec4dc4bf468895f85ef63bab52b3aefa20 /lib | |
| parent | 8fff6a3422e07ad45c1e8875476427eb81bb0e2e (diff) | |
| download | gitlab-ce-805a28e6a134b59ab3efa3ff6d6b0e16bd24c950.tar.gz | |
Revert "Merge branch 'fix-gitaly-install' into 'master'"
This reverts commit 23c502b43404aa70741462da5d57c23196f6088a, reversing
changes made to 1018ab0516fd94d1ffbc05a0ad8499947dd9630d.
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 3703f9cfb5c..680e76af471 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!([command]) } + Bundler.with_original_env { run_command!(%w[/usr/bin/env -u BUNDLE_GEMFILE] + [command]) } end end end |