summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-08-04 17:27:50 +0200
committerRémy Coutable <remy@rymai.me>2017-08-04 17:27:50 +0200
commit21937a157d435025d4ae0cf514fe7273302e1004 (patch)
treeb5433d7e65092ed88a0d4133e9f5015c639542ba /lib
parent201ce2cb55f1d016cdcb0653d9f9a11a8fec358d (diff)
downloadgitlab-ce-21937a157d435025d4ae0cf514fe7273302e1004.tar.gz
Print the setup steps and duration and fix an issue resulting in re-setuping GitLab Shell on each test run35941-fix-testing-issue-following-gitaly-install-fix
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'lib')
-rw-r--r--lib/tasks/gitlab/gitaly.rake2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tasks/gitlab/gitaly.rake b/lib/tasks/gitlab/gitaly.rake
index 5054f5e9bb2..9abd1c2cd6a 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 -u RUBYOPT] + [command]) }
+ Bundler.with_original_env { run_command!(%w[/usr/bin/env -u RUBYOPT] + [command]) }
end
end
end