Merge branch 'layout-of-upgrader'

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	doc/update/upgrader.md

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