Commit b057e58b6f32c9458fe212e8ef01ca4214860667

Authored by dosire
1 parent 68590fdd

Reword upgrade -y comment, improve layout and allow just y.

doc/update/upgrader.md
@@ -19,10 +19,8 @@ __GitLab Upgrader is available only for version 6.4.2 or higher__ @@ -19,10 +19,8 @@ __GitLab Upgrader is available only for version 6.4.2 or higher__
19 19
20 cd /home/git/gitlab 20 cd /home/git/gitlab
21 sudo -u git -H ruby script/upgrade.rb 21 sudo -u git -H ruby script/upgrade.rb
22 -  
23 - # it also supports -y option to avouid user input 22 + # to perform a non-interactive install (no user input required) you can add -y
24 # sudo -u git -H ruby script/upgrade.rb -y 23 # sudo -u git -H ruby script/upgrade.rb -y
25 -  
26 24
27 ### 3. Start application 25 ### 3. Start application
28 26
lib/gitlab/upgrader.rb
@@ -17,7 +17,7 @@ module Gitlab @@ -17,7 +17,7 @@ module Gitlab
17 prompt("Do you want to upgrade (yes/no)? ", %w{yes no}) 17 prompt("Do you want to upgrade (yes/no)? ", %w{yes no})
18 end 18 end
19 19
20 - if answer == "yes" 20 + if answer == "yes" || answer == "y"
21 upgrade 21 upgrade
22 else 22 else
23 exit 0 23 exit 0