summaryrefslogtreecommitdiff
path: root/lib/tasks
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-12-01 16:24:35 +0100
committerRémy Coutable <remy@rymai.me>2016-12-01 19:22:46 +0100
commit2c0bcefdc6af442f67f74c6124fc1a9cbacd2831 (patch)
tree92ec5cadff49ec121abae6084c3cee8ccc6c7049 /lib/tasks
parent8146ad819e626439ac16aa473f10112ddbcf01cd (diff)
downloadgitlab-ce-2c0bcefdc6af442f67f74c6124fc1a9cbacd2831.tar.gz
Don't allow to specify a repo or version when installing Workhorseremove-gitlab-workhorse-version-option-from-install-task
The task will use the canonical repo and the required version. Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'lib/tasks')
-rw-r--r--lib/tasks/gitlab/workhorse.rake4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/tasks/gitlab/workhorse.rake b/lib/tasks/gitlab/workhorse.rake
index 46bd0bf2e7b..baea94bf8ca 100644
--- a/lib/tasks/gitlab/workhorse.rake
+++ b/lib/tasks/gitlab/workhorse.rake
@@ -7,8 +7,8 @@ namespace :gitlab do
abort %(Please specify the directory where you want to install gitlab-workhorse:\n rake "gitlab:workhorse:install[/home/git/gitlab-workhorse]")
end
- tag = "v#{ENV['GITLAB_WORKHORSE_VERSION'] || Gitlab::Workhorse.version}"
- repo = ENV['GITLAB_WORKHORSE_REPO'] || 'https://gitlab.com/gitlab-org/gitlab-workhorse.git'
+ tag = "v#{Gitlab::Workhorse.version}"
+ repo = 'https://gitlab.com/gitlab-org/gitlab-workhorse.git'
checkout_or_clone_tag(tag: tag, repo: repo, target_dir: args.dir)