Merge branch 'patch-66' into 'master'

disable Rugged when switching to Gitaly without NFS

See merge request gitlab-org/gitlab-ce!29086

doc/administration/gitaly/index.md

@@ -220,6 +220,9 @@ network, firewall, or name resolution problem preventing your GitLab
 server from reaching the Gitaly server then all Gitaly requests will
 fail.
 
+Additionally, you need to 
+[disable Rugged if previously manually enabled](../high_availability/nfs.md#improving-nfs-performance-with-gitlab).
+
 We assume that your Gitaly server can be reached at
 `gitaly.internal:8075` from your GitLab server, and that Gitaly can read and
 write to `/mnt/gitlab/default` and `/mnt/gitlab/storage1` respectively.

doc/administration/high_availability/nfs.md

@@ -56,7 +56,8 @@ To do this, run the Rake task:
 sudo gitlab-rake gitlab:features:enable_rugged
 ```
 
-If you need to undo this setting for some reason, run:
+If you need to undo this setting for some reason such as switching to [Gitaly without NFS](gitaly.md)
+(recommended), run:
 
 ```sh
 sudo gitlab-rake gitlab:features:disable_rugged