Commit 660585ca authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

Bump gitlab shell

Use gitlab-shell v1.9.5

Fixes #1300
parents 5d6f5be0 94b0f1b2
...@@ -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
cd /home/git/gitlab cd /home/git/gitlab
# Run the installation task for gitlab-shell (replace `REDIS_URL` if needed): # 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: # 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 sudo -u git -H editor /home/git/gitlab-shell/config.yml
......
...@@ -779,7 +779,7 @@ namespace :gitlab do ...@@ -779,7 +779,7 @@ namespace :gitlab do
end end
def check_gitlab_shell 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) current_version = Gitlab::VersionInfo.parse(gitlab_shell_version)
print "GitLab Shell version >= #{required_version} ? ... " print "GitLab Shell version >= #{required_version} ? ... "
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment