summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/update/upgrader.md4
-rw-r--r--lib/gitlab/upgrader.rb2
2 files changed, 2 insertions, 4 deletions
diff --git a/doc/update/upgrader.md b/doc/update/upgrader.md
index 1f51005a8e9..4ced6357962 100644
--- a/doc/update/upgrader.md
+++ b/doc/update/upgrader.md
@@ -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
diff --git a/lib/gitlab/upgrader.rb b/lib/gitlab/upgrader.rb
index 859923cb563..d48fb8a40ca 100644
--- a/lib/gitlab/upgrader.rb
+++ b/lib/gitlab/upgrader.rb
@@ -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