Automatic merge of gitlab-org/gitlab-ce master

doc/administration/gitaly/index.md

@@ -247,8 +247,10 @@ gitlab:
   repositories:
     storages:
       default:
+        path: /mnt/gitlab/default/repositories
         gitaly_address: tcp://gitaly.internal:8075
       storage1:
+        path: /mnt/gitlab/storage1/repositories
         gitaly_address: tcp://gitaly.internal:8075
 
   gitaly:
@@ -293,8 +295,8 @@ sum(rate(gitaly_connections_total[5m])) by (type)
 ```ruby
 # /etc/gitlab/gitlab.rb
 git_data_dirs({
-  'default' => { 'path' => '/mnt/gitlab/default', 'gitaly_address' => 'tls://gitaly.internal:9999' },
-  'storage1' => { 'path' => '/mnt/gitlab/storage1', 'gitaly_address' => 'tls://gitaly.internal:9999' },
+  'default' => { 'gitaly_address' => 'tls://gitaly.internal:9999' },
+  'storage1' => { 'gitaly_address' => 'tls://gitaly.internal:9999' },
 })
 
 gitlab_rails['gitaly_token'] = 'abc123secret'