Merge pull request #9044 from tsigo/rs-git-template-env
Define GIT_TEMPLATE_DIR environment variable in TestEnv
This commit is contained in:
commit
275f64fb86
|
@ -85,7 +85,7 @@ module TestEnv
|
||||||
end
|
end
|
||||||
|
|
||||||
# We must copy bare repositories because we will push to them.
|
# We must copy bare repositories because we will push to them.
|
||||||
system(*%W(git clone -q --bare #{factory_repo_path} #{factory_repo_path_bare}))
|
system(git_env, *%W(git clone -q --bare #{factory_repo_path} #{factory_repo_path_bare}))
|
||||||
end
|
end
|
||||||
|
|
||||||
def copy_repo(project)
|
def copy_repo(project)
|
||||||
|
@ -113,4 +113,10 @@ module TestEnv
|
||||||
def factory_repo_name
|
def factory_repo_name
|
||||||
'gitlab-test'
|
'gitlab-test'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Prevent developer git configurations from being persisted to test
|
||||||
|
# repositories
|
||||||
|
def git_env
|
||||||
|
{'GIT_TEMPLATE_DIR' => ''}
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue