Merge branch 'layout-of-upgrader'

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: doc/update/upgrader.md

Merge branch 'layout-of-upgrader'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: doc/update/upgrader.md
Dmitriy Zaporozhets
2 parents 5966f5bb f1da402b
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
doc/update/upgrader.md
@@ -21,7 +21,7 @@ __GitLab Upgrader is available only for GitLab version 6.4.2 or higher__
     cd /home/git/gitlab
     sudo -u git -H ruby script/upgrade.rb
  
-    # it also supports -y option to avoid waiting for 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
...	...	@@ -21,7 +21,7 @@ __GitLab Upgrader is available only for GitLab version 6.4.2 or higher__
21	21	cd /home/git/gitlab
22	22	sudo -u git -H ruby script/upgrade.rb
23	23
24		- # it also supports -y option to avoid waiting for user input
	24	+ # to perform a non-interactive install (no user input required) you can add -y
25	25	# sudo -u git -H ruby script/upgrade.rb -y
26	26
27	27	### 3. Start application
...	...