Merge branch 'enable-gitaly' into 'master'

Enable gitaly in development by default

See merge request !261

Procfile.example

@@ -13,5 +13,5 @@ rails-background-jobs: exec /usr/bin/env SIDEKIQ_LOG_ARGUMENTS=1 RAILS_ENV=devel
 #grafana: exec support/wait-postgresql-ready support/exec-cd grafana bin/grafana-server -config grafana.ini
 #sshd: exec /usr/sbin/sshd -e -D -f /home/git/openssh/sshd_config
 #nginx: exec nginx -p /home/git/nginx -c conf/nginx.conf
-#gitaly: exec /usr/bin/env GITALY_SOCKET_PATH=/home/git/gitaly.socket GITALY_PROMETHEUS_LISTEN_ADDR=:9101 gitaly/bin/gitaly
+gitaly: exec /usr/bin/env GITALY_SOCKET_PATH=/home/git/gitaly.socket GITALY_PROMETHEUS_LISTEN_ADDR=:9101 gitaly/bin/gitaly
 webpack: exec /usr/bin/env NODE_ENV=development DEV_SERVER_PORT=3808 support/exec-cd gitlab npm run dev-server

support/edit-gitlab.yml

@@ -19,5 +19,12 @@ a
       host: localhost
       port: ${webpack_port:-3808}
 .
+1
+/^  extra:/
+i
+  gitaly:
+    socket_path: $(pwd)/gitaly.socket
+
+.
 wq
 EOF