Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-18 18:06:05 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-18 18:06:05 +0300
commit5c521d1f9b1e389e2f9b2b5fccf3798159a10f8d (patch)
tree2460d9f5229b4b42b117b33584276d1040e2803c /spec/support/helpers/test_env.rb
parent6cdc0f32fabea92606c8cda040a3d0875914b906 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support/helpers/test_env.rb')
-rw-r--r--spec/support/helpers/test_env.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/spec/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb
index 323c8d1baf2..a409dd2ef26 100644
--- a/spec/support/helpers/test_env.rb
+++ b/spec/support/helpers/test_env.rb
@@ -100,7 +100,6 @@ module TestEnv
clean_test_path
- # Set up GitLab shell for test instance
setup_gitlab_shell
setup_gitaly
@@ -145,10 +144,7 @@ module TestEnv
end
def setup_gitlab_shell
- component_timed_setup('GitLab Shell',
- install_dir: Gitlab.config.gitlab_shell.path,
- version: Gitlab::Shell.version_required,
- task: 'gitlab:shell:install')
+ FileUtils.mkdir_p(Gitlab.config.gitlab_shell.path)
end
def setup_gitaly