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

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