diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-11-08 12:04:56 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-11-08 12:04:56 +0300 |
| commit | 6641341b65d925a335e50f17a62a8a599ef54293 (patch) | |
| tree | 7edf9b240bdbf1cca564bc7b446eacdd32a7493d /lib/tasks | |
| parent | 36f9224e4a79b49d0958476395d1472ba9b52a2a (diff) | |
| parent | f36db59d97b375744ee1c05d07792a8d64ae945b (diff) | |
Merge pull request #8254 from cirosantilli/factor-get-shell-version
Factor GITLAB_SHELL_VERSION get method
Diffstat (limited to 'lib/tasks')
| -rw-r--r-- | lib/tasks/gitlab/check.rake | 10 | ||||
| -rw-r--r-- | lib/tasks/gitlab/shell.rake | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 56e8ff44988..7ff23a7600a 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -574,20 +574,16 @@ namespace :gitlab do Gitlab::Shell.new.version end - def required_gitlab_shell_version - File.read(File.join(Rails.root, "GITLAB_SHELL_VERSION")).strip - end - def gitlab_shell_major_version - required_gitlab_shell_version.split(".")[0].to_i + Gitlab::Shell.version_required.split('.')[0].to_i end def gitlab_shell_minor_version - required_gitlab_shell_version.split(".")[1].to_i + Gitlab::Shell.version_required.split('.')[1].to_i end def gitlab_shell_patch_version - required_gitlab_shell_version.split(".")[2].to_i + Gitlab::Shell.version_required.split('.')[2].to_i end def has_gitlab_shell3? diff --git a/lib/tasks/gitlab/shell.rake b/lib/tasks/gitlab/shell.rake index 6b8f9e377fe..202e55c89ad 100644 --- a/lib/tasks/gitlab/shell.rake +++ b/lib/tasks/gitlab/shell.rake @@ -4,7 +4,7 @@ namespace :gitlab do task :install, [:tag, :repo] => :environment do |t, args| warn_user_is_not_gitlab - default_version = File.read(File.join(Rails.root, "GITLAB_SHELL_VERSION")).strip + default_version = Gitlab::Shell.version_required args.with_defaults(tag: 'v' + default_version, repo: "https://gitlab.com/gitlab-org/gitlab-shell.git") user = Gitlab.config.gitlab.user |