Download as
Browse Code »

Commit 660585caa41002d9cfbe51842aaa6602b8de2895

Authored by Dmitriy Zaporozhets
2 parents 5d6f5be0 94b0f1b2
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge branch 'bump-gitlab-shell' into 'master' 

Bump gitlab shell

Use gitlab-shell v1.9.5

Fixes #1300
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
doc/install/installation.md
  Diff comments   View file @660585c
@@ -254,7 +254,7 @@ GitLab Shell is an ssh access and repository management software developed speci @@ -254,7 +254,7 @@ GitLab Shell is an ssh access and repository management software developed speci
254 cd /home/git/gitlab 254 cd /home/git/gitlab
255 255
256 # Run the installation task for gitlab-shell (replace `REDIS_URL` if needed): 256 # Run the installation task for gitlab-shell (replace `REDIS_URL` if needed):
257 - sudo -u git -H bundle exec rake gitlab:shell:install[v1.9.4] REDIS_URL=redis://localhost:6379 RAILS_ENV=production 257 + sudo -u git -H bundle exec rake gitlab:shell:install[v1.9.5] REDIS_URL=redis://localhost:6379 RAILS_ENV=production
258 258
259 # By default, the gitlab-shell config is generated from your main gitlab config. You can review (and modify) it as follows: 259 # By default, the gitlab-shell config is generated from your main gitlab config. You can review (and modify) it as follows:
260 sudo -u git -H editor /home/git/gitlab-shell/config.yml 260 sudo -u git -H editor /home/git/gitlab-shell/config.yml
lib/tasks/gitlab/check.rake
  Diff comments   View file @660585c
@@ -779,7 +779,7 @@ namespace :gitlab do @@ -779,7 +779,7 @@ namespace :gitlab do
779 end 779 end
780 780
781 def check_gitlab_shell 781 def check_gitlab_shell
782 - required_version = Gitlab::VersionInfo.new(1, 9, 4) 782 + required_version = Gitlab::VersionInfo.new(1, 9, 5)
783 current_version = Gitlab::VersionInfo.parse(gitlab_shell_version) 783 current_version = Gitlab::VersionInfo.parse(gitlab_shell_version)
784 784
785 print "GitLab Shell version >= #{required_version} ? ... " 785 print "GitLab Shell version >= #{required_version} ? ... "