Merge branch 'master' into 126-gitlab-10-4

www-servers/gitlab-gitaly/files/0001-gitlab-gitaly-0.10.0-fix-Makefile.patch

@@ -1,10 +0,0 @@
-diff --git a/Makefile b/Makefile
-index c822059..342da88 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,4 +1,4 @@
--PREFIX=/usr/local
-+PREFIX=${DESTDIR}/usr
- PKG=gitlab.com/gitlab-org/gitaly
- BUILD_DIR=$(shell pwd)
- BIN_BUILD_DIR=${BUILD_DIR}/_build/bin

www-servers/gitlab-gitaly/files/0002-gitlab-gitaly-0.11.2-fix-config.toml.example.patch

@@ -1,21 +0,0 @@
-diff --git a/config.toml.example b/config.toml.example
-index 3a987f9..801d192 100644
---- a/config.toml.example
-+++ b/config.toml.example
-@@ -1,6 +1,6 @@
- # Example Gitaly configuration file
- 
--socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket"
-+socket_path = "/run/gitlab/sockets/gitaly.socket"
- 
- # # Optional: listen on a TCP socket. This is insecure (no authentication)
- # listen_addr = "localhost:9999"
-@@ -12,7 +12,7 @@ socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket"
- 
- [[storage]]
- name = "default"
--path = "/home/git/repositories"
-+path = "/var/lib/git/repositories"
- 
- # # You can optionally configure more storages for this Gitaly instance to serve up
- #