diff options
| author | Ciro Santilli <ciro.santilli@gmail.com> | 2014-10-10 11:06:08 +0200 |
|---|---|---|
| committer | Ciro Santilli <ciro.santilli@gmail.com> | 2014-10-15 23:01:31 +0200 |
| commit | 39c66c822ec955205aa69a7d38b16669f488e8da (patch) | |
| tree | fa9d688476bd76df299373d02348ed8f13d21fdd /lib/tasks/gitlab/shell.rake | |
| parent | a0a826ebdcb783c660dd40d8cb217db28a9d4998 (diff) | |
| download | gitlab-ce-39c66c822ec955205aa69a7d38b16669f488e8da.tar.gz | |
Use Gitlab.config instead of Settings everywhere
Diffstat (limited to 'lib/tasks/gitlab/shell.rake')
| -rw-r--r-- | lib/tasks/gitlab/shell.rake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/tasks/gitlab/shell.rake b/lib/tasks/gitlab/shell.rake index a8f26a7c029..646ba98ca48 100644 --- a/lib/tasks/gitlab/shell.rake +++ b/lib/tasks/gitlab/shell.rake @@ -7,9 +7,9 @@ namespace :gitlab do default_version = File.read(File.join(Rails.root, "GITLAB_SHELL_VERSION")).strip args.with_defaults(tag: 'v' + default_version, repo: "https://gitlab.com/gitlab-org/gitlab-shell.git") - user = Settings.gitlab.user - home_dir = Rails.env.test? ? Rails.root.join('tmp/tests') : Settings.gitlab.user_home - gitlab_url = Settings.gitlab.url + user = Gitlab.config.gitlab.user + home_dir = Rails.env.test? ? Rails.root.join('tmp/tests') : Gitlab.config.gitlab.user_home + gitlab_url = Gitlab.config.gitlab.url # gitlab-shell requires a / at the end of the url gitlab_url += "/" unless gitlab_url.match(/\/$/) repos_path = Gitlab.config.gitlab_shell.repos_path |