diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-31 14:25:08 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-31 14:25:08 +0000 |
| commit | 660585caa41002d9cfbe51842aaa6602b8de2895 (patch) | |
| tree | 63baba35777223dbfe0675aaa659a8ee533537f9 | |
| parent | 5d6f5be0603e51514705976e35c2a6f2fff74c84 (diff) | |
| parent | 94b0f1b2bb691928ce0db0fba2ccfe02d1a5d11e (diff) | |
| download | gitlab-ce-660585caa41002d9cfbe51842aaa6602b8de2895.tar.gz | |
Merge branch 'bump-gitlab-shell' into 'master'
Bump gitlab shell
Use gitlab-shell v1.9.5
Fixes #1300
| -rw-r--r-- | doc/install/installation.md | 2 | ||||
| -rw-r--r-- | lib/tasks/gitlab/check.rake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md index 99731130624..0dc28d8da82 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -254,7 +254,7 @@ GitLab Shell is an ssh access and repository management software developed speci cd /home/git/gitlab # Run the installation task for gitlab-shell (replace `REDIS_URL` if needed): - sudo -u git -H bundle exec rake gitlab:shell:install[v1.9.4] REDIS_URL=redis://localhost:6379 RAILS_ENV=production + sudo -u git -H bundle exec rake gitlab:shell:install[v1.9.5] REDIS_URL=redis://localhost:6379 RAILS_ENV=production # By default, the gitlab-shell config is generated from your main gitlab config. You can review (and modify) it as follows: sudo -u git -H editor /home/git/gitlab-shell/config.yml diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 8a7f39599ab..362693b0603 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -779,7 +779,7 @@ namespace :gitlab do end def check_gitlab_shell - required_version = Gitlab::VersionInfo.new(1, 9, 4) + required_version = Gitlab::VersionInfo.new(1, 9, 5) current_version = Gitlab::VersionInfo.parse(gitlab_shell_version) print "GitLab Shell version >= #{required_version} ? ... " |