summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-04-19 15:09:08 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-04-19 15:09:08 +0000
commit6a3c4476fa8f1c686eadbed05262bce95504ffa7 (patch)
treed6e29b8f855e704d560d40df0726ba52e74aebca /scripts
parentc6af94ea4ea649171ff930b6bf94c73a5d03edb9 (diff)
downloadgitlab-ce-6a3c4476fa8f1c686eadbed05262bce95504ffa7.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
-rw-r--r--scripts/gitaly_test.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/gitaly_test.rb b/scripts/gitaly_test.rb
index f970457fea7..b7ea9cd628e 100644
--- a/scripts/gitaly_test.rb
+++ b/scripts/gitaly_test.rb
@@ -43,7 +43,7 @@ module GitalyTest
end
def env
- env_hash = {
+ {
'HOME' => File.expand_path('tmp/tests'),
'GEM_PATH' => Gem.path.join(':'),
'BUNDLE_APP_CONFIG' => File.join(gemfile_dir, '.bundle'),
@@ -54,8 +54,6 @@ module GitalyTest
# Git hooks can't run during tests as the internal API is not running.
'GITALY_TESTING_NO_GIT_HOOKS' => "1"
}
-
- env_hash
end
# rubocop:disable GitlabSecurity/SystemCommandInjection