diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-01-12 18:27:33 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-01-12 18:27:33 +0000 |
| commit | 3eebca7b5c8af599d4aec6f2b5b4905408079754 (patch) | |
| tree | df1e92a264836c19fb70f4d3d454124b9ee8758c /spec/support | |
| parent | 764fc0dd69b3e064d4b14ce8125fbb6daa98cf7f (diff) | |
| parent | 22a34c81aa3801e5b453fd2c0a9364917e0aedbe (diff) | |
| download | gitlab-ce-3eebca7b5c8af599d4aec6f2b5b4905408079754.tar.gz | |
Merge branch 'use-configured-git' into 'master'
Use configured git rather thans system git
See merge request !8460
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/seed_helper.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/support/seed_helper.rb b/spec/support/seed_helper.rb index 3f8398a31e3..03fa0a66b9a 100644 --- a/spec/support/seed_helper.rb +++ b/spec/support/seed_helper.rb @@ -25,32 +25,32 @@ module SeedHelper end def create_bare_seeds - system(git_env, *%W(git clone --bare #{GITLAB_URL}), + system(git_env, *%W(#{Gitlab.config.git.bin_path} clone --bare #{GITLAB_URL}), chdir: SEED_REPOSITORY_PATH, out: '/dev/null', err: '/dev/null') end def create_normal_seeds - system(git_env, *%W(git clone #{TEST_REPO_PATH} #{TEST_NORMAL_REPO_PATH}), + system(git_env, *%W(#{Gitlab.config.git.bin_path} clone #{TEST_REPO_PATH} #{TEST_NORMAL_REPO_PATH}), out: '/dev/null', err: '/dev/null') end def create_mutable_seeds - system(git_env, *%W(git clone #{TEST_REPO_PATH} #{TEST_MUTABLE_REPO_PATH}), + system(git_env, *%W(#{Gitlab.config.git.bin_path} clone #{TEST_REPO_PATH} #{TEST_MUTABLE_REPO_PATH}), out: '/dev/null', err: '/dev/null') system(git_env, *%w(git branch -t feature origin/feature), chdir: TEST_MUTABLE_REPO_PATH, out: '/dev/null', err: '/dev/null') - system(git_env, *%W(git remote add expendable #{GITLAB_URL}), + system(git_env, *%W(#{Gitlab.config.git.bin_path} remote add expendable #{GITLAB_URL}), chdir: TEST_MUTABLE_REPO_PATH, out: '/dev/null', err: '/dev/null') end def create_broken_seeds - system(git_env, *%W(git clone --bare #{TEST_REPO_PATH} #{TEST_BROKEN_REPO_PATH}), + system(git_env, *%W(#{Gitlab.config.git.bin_path} clone --bare #{TEST_REPO_PATH} #{TEST_BROKEN_REPO_PATH}), out: '/dev/null', err: '/dev/null') |