diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 89d4e80bb4d0..a8b8c3bc72b5 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,151 +1,155 @@
 PORTNAME=	gitaly
-DISTVERSION=	13.10.3
+DISTVERSION=	13.11.1
 PORTREVISION=	0
 CATEGORIES=	devel
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Smart reverse proxy for GitLab
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 # define dependencies that are required for build and run under MY_DEPENDS
-MY_DEPENDS=	git>=2.29:devel/git \
+MY_DEPENDS=	git>=2.31.1:devel/git \
 		rubygem-bundler>=2.1.4:sysutils/rubygem-bundler \
 		rubygem-rugged>=1.1<2:devel/rubygem-rugged \
 		rubygem-github-linguist>=7.12.1<8:textproc/rubygem-github-linguist \
 		rubygem-gitlab-markup>=1.7.1<1.8.0:textproc/rubygem-gitlab-markup \
-		rubygem-activesupport60>=6.0.3.4<6.0.4:devel/rubygem-activesupport60 \
+		rubygem-activesupport60>=6.0.3.6<6.0.4:devel/rubygem-activesupport60 \
 		rubygem-rdoc>=6.1<7.0:devel/rubygem-rdoc \
 		rubygem-gitlab-gollum-lib>=4.2.7.10.gitlab.1<4.2.8:www/rubygem-gitlab-gollum-lib \
-		rubygem-gitlab-gollum-rugged_adapter>=0.4.4.3.gitlab.1<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \
+		rubygem-gitlab-gollum-rugged_adapter>=0.4.4.4.gitlab.1<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \
 		rubygem-grpc130>=1.30.2<1.31:net/rubygem-grpc130 \
 		rubygem-sentry-raven>=3.0<4:devel/rubygem-sentry-raven \
 		rubygem-faraday>=1.0.1<2:www/rubygem-faraday \
 		rubygem-rbtrace>=0.4.14:devel/rubygem-rbtrace \
-		rubygem-gitlab-labkit>=0.16.1<0.17:devel/rubygem-gitlab-labkit \
+		rubygem-gitlab-labkit>=0.16.2<0.17:devel/rubygem-gitlab-labkit \
 		rubygem-licensee>=9.14.1<9.15:devel/rubygem-licensee \
-		rubygem-google-protobuf314>=3.12.0<3.15:devel/rubygem-google-protobuf314
+		rubygem-google-protobuf314>=3.14.0<3.15:devel/rubygem-google-protobuf314
 BUILD_DEPENDS=	gem:devel/ruby-gems \
 		bash>0:shells/bash \
 		${MY_DEPENDS}
 RUN_DEPENDS=	${MY_DEPENDS} \
 		gitlab-shell>=9.3.0:devel/gitlab-shell
 LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 USES=		gmake go:modules,no_targets pkgconfig
 USE_RUBY=	yes
 
 MAKE_ENV=	GOFLAGS="${GO_BUILDFLAGS}"
 # make sure to pass go build options into make process
 MAKE_ENV+=	${GO_ENV}
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags
-GL_COMMIT=	80796c538e2c8f45d311914c3d7a6b22866a0758
+GL_COMMIT=	538266fbaefe35385130e0f3c7b1865cec2a57b0
 
 # for go dependencies
 USE_GITHUB=	nodefault
 # generated with: make gomod-vendor
-# 85dd
+# 89dd
 GH_TUPLE=	\
 		DataDog:dd-trace-go:v1.7.0:datadog_dd_trace_go/vendor/gopkg.in/DataDog/dd-trace-go.v1 \
 		alexbrainman:sspi:909beea2cc74:alexbrainman_sspi/vendor/github.com/alexbrainman/sspi \
 		avast:retry-go:v3.0.0:avast_retry_go/vendor/github.com/avast/retry-go \
 		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
 		census-instrumentation:opencensus-go:v0.22.2:census_instrumentation_opencensus_go/vendor/go.opencensus.io \
 		client9:reopen:v1.0.0:client9_reopen/vendor/github.com/client9/reopen \
-		cloudflare:tableflip:4baec9811f2b:cloudflare_tableflip/vendor/github.com/cloudflare/tableflip \
+		cloudflare:tableflip:v1.2.2:cloudflare_tableflip/vendor/github.com/cloudflare/tableflip \
 		HdrHistogram:hdrhistogram-go:3a0bb77429bd:codahale_hdrhistogram_go/vendor/github.com/codahale/hdrhistogram \
 		containerd:cgroups:2819c83ced99:containerd_cgroups/vendor/github.com/containerd/cgroups \
 		coreos:go-systemd:v22.0.0:coreos_go_systemd_v22/vendor/github.com/coreos/go-systemd/v22 \
 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
 		docker:go-units:v0.4.0:docker_go_units/vendor/github.com/docker/go-units \
 		dpotapov:go-spnego:c2c609116ad0:dpotapov_go_spnego/vendor/github.com/dpotapov/go-spnego \
 		getsentry:sentry-go:v0.7.0:getsentry_sentry_go/vendor/github.com/getsentry/sentry-go \
 		git-lfs:git-lfs:2e1d981afbe3:git_lfs_git_lfs/vendor/github.com/git-lfs/git-lfs \
 		git-lfs:gitobj:v2.0.1:git_lfs_gitobj_v2/vendor/github.com/git-lfs/gitobj/v2 \
 		git-lfs:go-netrc:e0e9ca483a18:git_lfs_go_netrc/vendor/github.com/git-lfs/go-netrc \
 		git-lfs:wildmatch:v1.0.4:git_lfs_wildmatch/vendor/github.com/git-lfs/wildmatch \
 		go-gorp:gorp:v1.7.2:go_gorp_gorp/vendor/gopkg.in/gorp.v1 \
 		go-yaml:yaml:9f266ea9e77c:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
 		go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
 		godbus:dbus:v5.0.3:godbus_dbus_v5/vendor/github.com/godbus/dbus/v5 \
 		gogo:protobuf:v1.3.1:gogo_protobuf/vendor/github.com/gogo/protobuf \
 		golang:appengine:v1.6.5:golang_appengine/vendor/google.golang.org/appengine \
 		golang:crypto:be400aefbc4c:golang_crypto/vendor/golang.org/x/crypto \
 		golang:exp:e8c3332aa8e5:golang_exp/vendor/golang.org/x/exp \
 		golang:groupcache:215e87163ea7:golang_groupcache/vendor/github.com/golang/groupcache \
+		golang:lint:fdd1cda4f05f:golang_lint/vendor/golang.org/x/lint \
 		golang:net:5f4716e94777:golang_net/vendor/golang.org/x/net \
 		golang:oauth2:bf48bf16ab8d:golang_oauth2/vendor/golang.org/x/oauth2 \
 		golang:protobuf:v1.3.3:golang_protobuf/vendor/github.com/golang/protobuf \
 		golang:sync:6e8e738ad208:golang_sync/vendor/golang.org/x/sync \
-		golang:sys:ed752295db88:golang_sys/vendor/golang.org/x/sys \
+		golang:sys:b64e53b001e4:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.3.3:golang_text/vendor/golang.org/x/text \
+		golang:tools:b753a1ba74fa:golang_tools/vendor/golang.org/x/tools \
 		google:go-cmp:v0.4.0:google_go_cmp/vendor/github.com/google/go-cmp \
 		google:go-genproto:7949de9c1215:google_go_genproto/vendor/google.golang.org/genproto \
 		google:pprof:d4f498aebedc:google_pprof/vendor/github.com/google/pprof \
 		google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \
 		googleapis:gax-go:v2.0.5:googleapis_gax_go_v2/vendor/github.com/googleapis/gax-go \
 		googleapis:google-api-go-client:v0.15.0:googleapis_google_api_go_client/vendor/google.golang.org/api \
 		googleapis:google-cloud-go:v0.50.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \
 		grpc-ecosystem:go-grpc-middleware:be4c235f9d1c:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \
 		grpc-ecosystem:go-grpc-prometheus:v1.2.0:grpc_ecosystem_go_grpc_prometheus/vendor/github.com/grpc-ecosystem/go-grpc-prometheus \
 		grpc:grpc-go:v1.29.1:grpc_grpc_go/vendor/google.golang.org/grpc \
 		hashicorp:go-uuid:v1.0.2:hashicorp_go_uuid/vendor/github.com/hashicorp/go-uuid \
 		hashicorp:golang-lru:v0.5.4:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \
+		hashicorp:yamux:a95892c5f864:hashicorp_yamux/vendor/github.com/hashicorp/yamux \
 		jcmturner:aescts:v1.0.1:jcmturner_aescts/vendor/gopkg.in/jcmturner/aescts.v1 \
 		jcmturner:dnsutils:v1.0.1:jcmturner_dnsutils/vendor/gopkg.in/jcmturner/dnsutils.v1 \
 		jcmturner:gofork:v1.0.0:jcmturner_gofork/vendor/github.com/jcmturner/gofork \
 		jcmturner:gokrb5:v5.3.0:jcmturner_gokrb5/vendor/gopkg.in/jcmturner/gokrb5.v5 \
 		jcmturner:rpc:v0.0.2:jcmturner_rpc/vendor/gopkg.in/jcmturner/rpc.v0 \
 		kelseyhightower:envconfig:v1.3.0:kelseyhightower_envconfig/vendor/github.com/kelseyhightower/envconfig \
 		lib:pq:v1.2.0:lib_pq/vendor/github.com/lib/pq \
 		libgit2:git2go:v31.4.12:libgit2_git2go_v31/vendor/github.com/libgit2/git2go/v31 \
 		lightstep:lightstep-tracer-go:v0.15.6:lightstep_lightstep_tracer_go/vendor/github.com/lightstep/lightstep-tracer-go \
 		mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
 		mattn:go-runewidth:v0.0.4:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
 		matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
 		oklog:ulid:v2.0.2:oklog_ulid_v2/vendor/github.com/oklog/ulid/v2 \
 		olekukonko:tablewriter:v0.0.2:olekukonko_tablewriter/vendor/github.com/olekukonko/tablewriter \
 		olekukonko:ts:78ecb04241c0:olekukonko_ts/vendor/github.com/olekukonko/ts \
 		opencontainers:runtime-spec:v1.0.2:opencontainers_runtime_spec/vendor/github.com/opencontainers/runtime-spec \
 		opentracing:opentracing-go:v1.2.0:opentracing_opentracing_go/vendor/github.com/opentracing/opentracing-go \
 		otiai10:curr:v1.0.0:otiai10_curr/vendor/github.com/otiai10/curr \
 		pelletier:go-toml:v1.8.1:pelletier_go_toml/vendor/github.com/pelletier/go-toml \
 		philhofer:fwd:v1.0.0:philhofer_fwd/vendor/github.com/philhofer/fwd \
 		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
 		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
 		prometheus:client_golang:v1.0.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
 		prometheus:client_model:14fe0d1b01d4:prometheus_client_model/vendor/github.com/prometheus/client_model \
 		prometheus:common:v0.4.1:prometheus_common/vendor/github.com/prometheus/common \
 		prometheus:procfs:v0.0.3:prometheus_procfs/vendor/github.com/prometheus/procfs \
 		rubenv:sql-migrate:06338513c237:rubenv_sql_migrate/vendor/github.com/rubenv/sql-migrate \
 		rubyist:tracerx:787959303086:rubyist_tracerx/vendor/github.com/rubyist/tracerx \
 		sebest:xff:6c115e0ffa35:sebest_xff/vendor/github.com/sebest/xff \
 		sirupsen:logrus:v1.7.0:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
 		ssgelm:cookiejarparser:v1.0.1:ssgelm_cookiejarparser/vendor/github.com/ssgelm/cookiejarparser \
 		stretchr:objx:v0.1.1:stretchr_objx/vendor/github.com/stretchr/objx \
 		stretchr:testify:v1.6.1:stretchr_testify/vendor/github.com/stretchr/testify \
 		tinylib:msgp:v1.1.0:tinylib_msgp/vendor/github.com/tinylib/msgp \
+		uber-go:goleak:v1.1.10:uber_go_goleak/vendor/go.uber.org/goleak \
 		uber:jaeger-client-go:v2.15.0:uber_jaeger_client_go/vendor/github.com/uber/jaeger-client-go \
 		uber:jaeger-lib:v1.5.0:uber_jaeger_lib/vendor/github.com/uber/jaeger-lib
 
 GL_TUPLE=	gitlab-org:gitlab-shell:3f9890ef73dced430d86801a1efc0e93ec50890e:gitlab_org_gitlab_shell/vendor/gitlab.com/gitlab-org/gitlab-shell \
 		gitlab-org:labkit:f2d7fb209ecad2eaddb5fb9c4ab03eb8eaa82811:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit
 
 post-patch:
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example
 	${MV} ${WRKSRC}/config.toml.example ${WRKSRC}/config.toml.sample
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${DATADIR}/bin
 	${FIND} ${WRKSRC} -name '*.orig' -delete
 	${FIND} ${WRKSRC} -name "Gemfile.lock" -delete
 	(cd ${WRKSRC}/_build/bin/ && ${COPYTREE_SHARE} .  ${STAGEDIR}${DATADIR}/bin && \
 	cd ${WRKSRC} && ${COPYTREE_SHARE} config.toml.sample  ${STAGEDIR}${DATADIR}) && \
 	cd ${WRKSRC}/ruby && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ruby
 
 .include <bsd.port.mk>
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index df0ae8e3774c..b4783b5ba674 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,169 +1,177 @@
-TIMESTAMP = 1618497419
+TIMESTAMP = 1619179548
 SHA256 (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = d81bd47683ef9cbd228691b077373d3e15ca5fa5b9e7919099c4e87779040e84
 SIZE (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = 3321111
 SHA256 (alexbrainman-sspi-909beea2cc74_GH0.tar.gz) = 50b452d12987d884f45c85bd2de8ea7076cd54f6f2c8b612a1d4c1704e52b5df
 SIZE (alexbrainman-sspi-909beea2cc74_GH0.tar.gz) = 21761
 SHA256 (avast-retry-go-v3.0.0_GH0.tar.gz) = 29c23aa245946c95616bc067341c09befa27a386d5bda8d9cadb96fd5e4742ee
 SIZE (avast-retry-go-v3.0.0_GH0.tar.gz) = 9540
 SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
 SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
 SHA256 (census-instrumentation-opencensus-go-v0.22.2_GH0.tar.gz) = 0aa930142b669d7c47e2b8343f6adc9f03414a9c45763c5f746de95231d6ad6d
 SIZE (census-instrumentation-opencensus-go-v0.22.2_GH0.tar.gz) = 165321
 SHA256 (client9-reopen-v1.0.0_GH0.tar.gz) = 64829db9b9fd0dd94b2444c45a2cb6e926b79c3a2e589a75a5edc2ba488a7875
 SIZE (client9-reopen-v1.0.0_GH0.tar.gz) = 6283
-SHA256 (cloudflare-tableflip-4baec9811f2b_GH0.tar.gz) = d9437a27968b8d30e3923c1da75f3fd5b4fca4ea537073a22a089ab35c2106cd
-SIZE (cloudflare-tableflip-4baec9811f2b_GH0.tar.gz) = 16376
+SHA256 (cloudflare-tableflip-v1.2.2_GH0.tar.gz) = c4773f3a8de95bf654d3002d52880940c0d7278ad583f04a850e2759e92cb431
+SIZE (cloudflare-tableflip-v1.2.2_GH0.tar.gz) = 17812
 SHA256 (HdrHistogram-hdrhistogram-go-3a0bb77429bd_GH0.tar.gz) = bf9c0b3bc04b0d4ed31e2019240a2854f650b87a383f47824f8af222e58a4001
 SIZE (HdrHistogram-hdrhistogram-go-3a0bb77429bd_GH0.tar.gz) = 7738
 SHA256 (containerd-cgroups-2819c83ced99_GH0.tar.gz) = 716242603cc675f072031528fab440588dfc1350e4dc037a546234fee52ef7d9
 SIZE (containerd-cgroups-2819c83ced99_GH0.tar.gz) = 83338
 SHA256 (coreos-go-systemd-v22.0.0_GH0.tar.gz) = c531193b788f30a0927a0f1396b9010b81227b7a29c5a324cf867202e2099af4
 SIZE (coreos-go-systemd-v22.0.0_GH0.tar.gz) = 67883
 SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
 SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
 SHA256 (docker-go-units-v0.4.0_GH0.tar.gz) = b411f15ca9b419880006f3944b8ec87dc3fe15cbba3beb6e04f2c03f9ea8370b
 SIZE (docker-go-units-v0.4.0_GH0.tar.gz) = 11514
 SHA256 (dpotapov-go-spnego-c2c609116ad0_GH0.tar.gz) = 8093037eed2321f7496b3f66a3396e798463a2bb7dbf7e8bf9b0b54bc7c20a97
 SIZE (dpotapov-go-spnego-c2c609116ad0_GH0.tar.gz) = 4294
 SHA256 (getsentry-sentry-go-v0.7.0_GH0.tar.gz) = b5e7432442928e4b03f61d4cb97e5d0b815e6c8618fbf34aa6275aab2218b27e
 SIZE (getsentry-sentry-go-v0.7.0_GH0.tar.gz) = 89499
 SHA256 (git-lfs-git-lfs-2e1d981afbe3_GH0.tar.gz) = ac86befae8b958b79c460ca45e5982e87d472c071710b37b97743f27d4ac0b1c
 SIZE (git-lfs-git-lfs-2e1d981afbe3_GH0.tar.gz) = 2871805
 SHA256 (git-lfs-gitobj-v2.0.1_GH0.tar.gz) = 67ef655aff54198e8d51699cd247e3def990e85548e5055ceb4a5d8a101a96cd
 SIZE (git-lfs-gitobj-v2.0.1_GH0.tar.gz) = 96072
 SHA256 (git-lfs-go-netrc-e0e9ca483a18_GH0.tar.gz) = f42d0b92162e3b104d79ec86281c7c1f16a40b0a9ae4d311003fe4c0bce03e89
 SIZE (git-lfs-go-netrc-e0e9ca483a18_GH0.tar.gz) = 8477
 SHA256 (git-lfs-wildmatch-v1.0.4_GH0.tar.gz) = 03fb70141dfa9064aefd59e51df396fbc1a5b9fb7b44997414c0a216aafb62c0
 SIZE (git-lfs-wildmatch-v1.0.4_GH0.tar.gz) = 9580
 SHA256 (go-gorp-gorp-v1.7.2_GH0.tar.gz) = 63488c583d4bf25eb03f8224eef5934158da81650063a96b53ff4f50b9ff5409
 SIZE (go-gorp-gorp-v1.7.2_GH0.tar.gz) = 36726
 SHA256 (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 63efc9aabcbb56b2c9469927784fd67ecb3a79720c4fa754c511335a04156d04
 SIZE (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 86898
 SHA256 (go-yaml-yaml-v2.4.0_GH0.tar.gz) = d8e94679e5fff6bd1a35e10241543929a5f3da44f701755babf99b3daf0faac0
 SIZE (go-yaml-yaml-v2.4.0_GH0.tar.gz) = 73209
 SHA256 (godbus-dbus-v5.0.3_GH0.tar.gz) = 49d27bde2861f5e5ab4195fddc5f38f25324aac3b32b3cc03e712cca3d2b75fa
 SIZE (godbus-dbus-v5.0.3_GH0.tar.gz) = 63630
 SHA256 (gogo-protobuf-v1.3.1_GH0.tar.gz) = 5184f06decd681fcc82f6583976111faf87189c0c2f8063b34ac2ea9ed997236
 SIZE (gogo-protobuf-v1.3.1_GH0.tar.gz) = 2038188
 SHA256 (golang-appengine-v1.6.5_GH0.tar.gz) = 4e7df5d4ec2dda0f59f26925b36a087843fd1a165adb938712068376bf791316
 SIZE (golang-appengine-v1.6.5_GH0.tar.gz) = 332903
 SHA256 (golang-crypto-be400aefbc4c_GH0.tar.gz) = 52f3f5dc88c5ab7428a9bed403127266d1b5fc90af6a4f6685f98259bb7b7452
 SIZE (golang-crypto-be400aefbc4c_GH0.tar.gz) = 1722808
 SHA256 (golang-exp-e8c3332aa8e5_GH0.tar.gz) = 02d36b798456326f37ca4bebc8824c0eafe650ae9b0fc2673a034d7c3add5422
 SIZE (golang-exp-e8c3332aa8e5_GH0.tar.gz) = 1513507
 SHA256 (golang-groupcache-215e87163ea7_GH0.tar.gz) = 500b097a42fb5c0cd516f1bb56e9c745ba6c1c910b4dc7296aea2b9120ee5e70
 SIZE (golang-groupcache-215e87163ea7_GH0.tar.gz) = 26040
+SHA256 (golang-lint-fdd1cda4f05f_GH0.tar.gz) = d02215cdf7a8c9e1874406b0414f3799e13e235ed4de142f837f68aa69d6fd55
+SIZE (golang-lint-fdd1cda4f05f_GH0.tar.gz) = 31573
 SHA256 (golang-net-5f4716e94777_GH0.tar.gz) = 987ec0774e8480615daf0664cd9c9ec9eb25cf6e553e32ae38697515629714b6
 SIZE (golang-net-5f4716e94777_GH0.tar.gz) = 1251426
 SHA256 (golang-oauth2-bf48bf16ab8d_GH0.tar.gz) = 28b3a51a8bd90beb5952d1080218ea238127edfe9455ad48921989619ff918a8
 SIZE (golang-oauth2-bf48bf16ab8d_GH0.tar.gz) = 47016
 SHA256 (golang-protobuf-v1.3.3_GH0.tar.gz) = b3a1440808d6ed4dc0d194c482de029f6c116b1de7f7a3bf927324d965ff3853
 SIZE (golang-protobuf-v1.3.3_GH0.tar.gz) = 315377
 SHA256 (golang-sync-6e8e738ad208_GH0.tar.gz) = 011eb5dc95a0ede8be5d68edde93be5af1b88d7fc098d0f74c6f7560beb378f0
 SIZE (golang-sync-6e8e738ad208_GH0.tar.gz) = 17288
-SHA256 (golang-sys-ed752295db88_GH0.tar.gz) = 0d6424cced930a084d419bdba3b05f08a2dbc1d534f81b4bebcb7ae73d9de427
-SIZE (golang-sys-ed752295db88_GH0.tar.gz) = 1085924
+SHA256 (golang-sys-b64e53b001e4_GH0.tar.gz) = 4c32d52373df17d9c40604d76e189f274c6fd1386d4d23b9114dbb9805079796
+SIZE (golang-sys-b64e53b001e4_GH0.tar.gz) = 1103798
 SHA256 (golang-text-v0.3.3_GH0.tar.gz) = 1604233637e3593749fbbb13b5069b08e6feba6d2b55a02fd3148793d5871185
 SIZE (golang-text-v0.3.3_GH0.tar.gz) = 7747332
+SHA256 (golang-tools-b753a1ba74fa_GH0.tar.gz) = f2113b46975e020ac89dcb60e74a5760408c2173cdfbe353ca30a80339a2dc33
+SIZE (golang-tools-b753a1ba74fa_GH0.tar.gz) = 2341520
 SHA256 (google-go-cmp-v0.4.0_GH0.tar.gz) = 97964b47aa6dc61007f9e1b1ad67812f0a8a2380072a59daebac7bc0cdcf740a
 SIZE (google-go-cmp-v0.4.0_GH0.tar.gz) = 81600
 SHA256 (google-go-genproto-7949de9c1215_GH0.tar.gz) = a89e3dc49016b3bc24360b543070e17a429aabdf38a7baa0415846a12319dabb
 SIZE (google-go-genproto-7949de9c1215_GH0.tar.gz) = 7836770
 SHA256 (google-pprof-d4f498aebedc_GH0.tar.gz) = 996b1f210183d8541a3a3cf22a2045396e4473cb92123c1b13613c0726a7bb76
 SIZE (google-pprof-d4f498aebedc_GH0.tar.gz) = 1145078
 SHA256 (google-uuid-v1.1.1_GH0.tar.gz) = bebd4b0b4ea152a9793615ef23c83f688876d8c284a2092264d20a4bf4ffc423
 SIZE (google-uuid-v1.1.1_GH0.tar.gz) = 13543
 SHA256 (googleapis-gax-go-v2.0.5_GH0.tar.gz) = 3089affe6f5e27f7a6d494cb399aa6baf232384f763f548ad5ddfbea0e88e59c
 SIZE (googleapis-gax-go-v2.0.5_GH0.tar.gz) = 15328
 SHA256 (googleapis-google-api-go-client-v0.15.0_GH0.tar.gz) = 6d628266b507a71f26ce2fd426758e1241f9dd94458752d9d12a0b09da983844
 SIZE (googleapis-google-api-go-client-v0.15.0_GH0.tar.gz) = 13259795
 SHA256 (googleapis-google-cloud-go-v0.50.0_GH0.tar.gz) = 8227c310b0059f9b1eb2ca16e9cebb3550272b929aaa1de7039a47d353ab8a18
 SIZE (googleapis-google-cloud-go-v0.50.0_GH0.tar.gz) = 2410793
 SHA256 (grpc-ecosystem-go-grpc-middleware-be4c235f9d1c_GH0.tar.gz) = 1316c500919bee1c0064908aeec3395c50683dea8e47adcc6663b7a04cdc984e
 SIZE (grpc-ecosystem-go-grpc-middleware-be4c235f9d1c_GH0.tar.gz) = 101217
 SHA256 (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = eba66530952a126ab869205bdb909af607bfd9eb09f00207b62eb29140258aa9
 SIZE (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = 24760
 SHA256 (grpc-grpc-go-v1.29.1_GH0.tar.gz) = b626c128878d1d7aaf79c6f4f73cba0eadd26405a30fc00b71cc9a12e56fef38
 SIZE (grpc-grpc-go-v1.29.1_GH0.tar.gz) = 892944
 SHA256 (hashicorp-go-uuid-v1.0.2_GH0.tar.gz) = 2dee0f810c3e3a2cd3d49a075d0a64a88806c90712a4b66013b20a1ff0562eae
 SIZE (hashicorp-go-uuid-v1.0.2_GH0.tar.gz) = 7058
 SHA256 (hashicorp-golang-lru-v0.5.4_GH0.tar.gz) = d50c188af0cc8b22e7e4b79e9071694fa06428a9964b22d68dc997fa787a177a
 SIZE (hashicorp-golang-lru-v0.5.4_GH0.tar.gz) = 13428
+SHA256 (hashicorp-yamux-a95892c5f864_GH0.tar.gz) = 9468ab6cee06cee3e1883a99f5d763bd8d9111e13ce499c5f5f5a705a9979789
+SIZE (hashicorp-yamux-a95892c5f864_GH0.tar.gz) = 24397
 SHA256 (jcmturner-aescts-v1.0.1_GH0.tar.gz) = 89d8aa45b05c9cd5e66c40a5c4f3a5224dbf9632d1fd1e27d05f2ad26effae32
 SIZE (jcmturner-aescts-v1.0.1_GH0.tar.gz) = 7311
 SHA256 (jcmturner-dnsutils-v1.0.1_GH0.tar.gz) = 9781a79a5b46e6ad245d238d1be1b37d8eab9ca9e57edb575ef0af158adeeefb
 SIZE (jcmturner-dnsutils-v1.0.1_GH0.tar.gz) = 6346
 SHA256 (jcmturner-gofork-v1.0.0_GH0.tar.gz) = d85188110837abd563dca4d9013665f82348a541beb47ee08207e70a161c9755
 SIZE (jcmturner-gofork-v1.0.0_GH0.tar.gz) = 27036
 SHA256 (jcmturner-gokrb5-v5.3.0_GH0.tar.gz) = a33a482f48b9b230cccee66e3d5335c23fc52a8afc240e243c873766886bad87
 SIZE (jcmturner-gokrb5-v5.3.0_GH0.tar.gz) = 55015964
 SHA256 (jcmturner-rpc-v0.0.2_GH0.tar.gz) = 61aeb3064e5659e26ab0a9e75108f4dbf9ade7ca2b030d147e583948a5e3c39c
 SIZE (jcmturner-rpc-v0.0.2_GH0.tar.gz) = 9128
 SHA256 (kelseyhightower-envconfig-v1.3.0_GH0.tar.gz) = 3556a0d014ba778b78955e8ec9fc320de81509f4aa582ea3b6ce18476c3e40dd
 SIZE (kelseyhightower-envconfig-v1.3.0_GH0.tar.gz) = 12408
 SHA256 (lib-pq-v1.2.0_GH0.tar.gz) = 052e9ce4472eda212e5034fd0298fcf254c22925b1d596b1d043a7a60fe4672e
 SIZE (lib-pq-v1.2.0_GH0.tar.gz) = 96083
 SHA256 (libgit2-git2go-v31.4.12_GH0.tar.gz) = 4425db097e682e62a1781a83f1eeb22b6106a7e5f3459742fda8de69466f8b1d
 SIZE (libgit2-git2go-v31.4.12_GH0.tar.gz) = 115471
 SHA256 (lightstep-lightstep-tracer-go-v0.15.6_GH0.tar.gz) = b3c3245404b05ea7d030591c1862a807cc0801ce561553b8b7682cb0e198fb14
 SIZE (lightstep-lightstep-tracer-go-v0.15.6_GH0.tar.gz) = 194986
 SHA256 (mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8fd2bd9b784bde00d0ea99fb251039fc10c611c
 SIZE (mattn-go-isatty-v0.0.12_GH0.tar.gz) = 4548
 SHA256 (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 1973c2de25bc69c3786a00e8118f4d22aa0d040bdfe46c8c8c30419b23e53dfe
 SIZE (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 19827
 SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b
 SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184
 SHA256 (oklog-ulid-v2.0.2_GH0.tar.gz) = d2b0dadd45201cd3385736bd5bd9c8c572e42249e713fe65dfb1e1df6870e3e3
 SIZE (oklog-ulid-v2.0.2_GH0.tar.gz) = 56670
 SHA256 (olekukonko-tablewriter-v0.0.2_GH0.tar.gz) = 07e3c6c6f36f6d6e5fc0aa5490f756a9d987e2f3ed20c74e1ec3805c027fd71d
 SIZE (olekukonko-tablewriter-v0.0.2_GH0.tar.gz) = 18831
 SHA256 (olekukonko-ts-78ecb04241c0_GH0.tar.gz) = e773762d9adb136c048e20f75f90ed3da9c4fd670c1798d26ef592b9aa4e44c7
 SIZE (olekukonko-ts-78ecb04241c0_GH0.tar.gz) = 3173
 SHA256 (opencontainers-runtime-spec-v1.0.2_GH0.tar.gz) = 0933a1ba6e418fe020993e80426107da8de3572f3f20b4cd1ef296de6e62bb61
 SIZE (opencontainers-runtime-spec-v1.0.2_GH0.tar.gz) = 71840
 SHA256 (opentracing-opentracing-go-v1.2.0_GH0.tar.gz) = cb32b383422a9aae11d260657d52a3789bd799802881b9ced3ee82c370be6f76
 SIZE (opentracing-opentracing-go-v1.2.0_GH0.tar.gz) = 35914
 SHA256 (otiai10-curr-v1.0.0_GH0.tar.gz) = 4db2a3563b84d3888758cd426473cfcfd0f9f5938a78342d140e9424a7ecdf33
 SIZE (otiai10-curr-v1.0.0_GH0.tar.gz) = 2464
 SHA256 (pelletier-go-toml-v1.8.1_GH0.tar.gz) = 837b8407fb401deff36961ce32498a1145c5ef4bad0b0060a25e632c14621941
 SIZE (pelletier-go-toml-v1.8.1_GH0.tar.gz) = 98819
 SHA256 (philhofer-fwd-v1.0.0_GH0.tar.gz) = 55736f48940198a11b7aeb4faba258459451994a8889ec003ce8d8d26ceca9ff
 SIZE (philhofer-fwd-v1.0.0_GH0.tar.gz) = 9221
 SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
 SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
 SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
 SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
 SHA256 (prometheus-client_golang-v1.0.0_GH0.tar.gz) = afee7b61a77342cc24ea55e284d08688267efca1843e529a51799fe52c5ee662
 SIZE (prometheus-client_golang-v1.0.0_GH0.tar.gz) = 138046
 SHA256 (prometheus-client_model-14fe0d1b01d4_GH0.tar.gz) = e86922566dae5bd684e2b77baabfaee9df34ce11cd7c8bae688b512b3a496f03
 SIZE (prometheus-client_model-14fe0d1b01d4_GH0.tar.gz) = 57495
 SHA256 (prometheus-common-v0.4.1_GH0.tar.gz) = 99229ef4b100e55d1e6496995f1a1af6813426b8820521bc041340eb077985b9
 SIZE (prometheus-common-v0.4.1_GH0.tar.gz) = 98631
 SHA256 (prometheus-procfs-v0.0.3_GH0.tar.gz) = 3af9b805166932b771dfa19a4c94eb83ceefd2eb54d1a314c3bf15a5f3154d0d
 SIZE (prometheus-procfs-v0.0.3_GH0.tar.gz) = 91880
 SHA256 (rubenv-sql-migrate-06338513c237_GH0.tar.gz) = 922ed3e65f2fa3ad337259253b541204de5448eeb2a1db6d5361419204dd8e67
 SIZE (rubenv-sql-migrate-06338513c237_GH0.tar.gz) = 29603
 SHA256 (rubyist-tracerx-787959303086_GH0.tar.gz) = ab122682b792765fbd999c6b97812e9b10eb9717ceb0863f02b437a818410b60
 SIZE (rubyist-tracerx-787959303086_GH0.tar.gz) = 2833
 SHA256 (sebest-xff-6c115e0ffa35_GH0.tar.gz) = e39b98f5b0622d8d6599ca14011b4e148324eff67b69524b0ef766d64050d9e3
 SIZE (sebest-xff-6c115e0ffa35_GH0.tar.gz) = 4000
 SHA256 (sirupsen-logrus-v1.7.0_GH0.tar.gz) = a7baaa1c646441d002f3867b5998b6b45b629ecfad317d468a981e23e0c9c6ca
 SIZE (sirupsen-logrus-v1.7.0_GH0.tar.gz) = 46392
 SHA256 (ssgelm-cookiejarparser-v1.0.1_GH0.tar.gz) = 8989734dc34c4cbd7841a98d96c4d9dbe3184be27f5b3a5d3a8e377d17a7f2f3
 SIZE (ssgelm-cookiejarparser-v1.0.1_GH0.tar.gz) = 3237
 SHA256 (stretchr-objx-v0.1.1_GH0.tar.gz) = 3bb0a581651f4c040435a70167ab60b723c5af04a5b0326af3c8b01ccc6fdcf0
 SIZE (stretchr-objx-v0.1.1_GH0.tar.gz) = 75768
 SHA256 (stretchr-testify-v1.6.1_GH0.tar.gz) = 40fd7204ab72ca9d8759f1cc3604dd17f556a0f9177f6fc05dd0cad9f06e708f
 SIZE (stretchr-testify-v1.6.1_GH0.tar.gz) = 84215
 SHA256 (tinylib-msgp-v1.1.0_GH0.tar.gz) = 30ac583b725d84aee147c26d1bc31e8770a3911e8437461cda0e53fb69c54570
 SIZE (tinylib-msgp-v1.1.0_GH0.tar.gz) = 77923
+SHA256 (uber-go-goleak-v1.1.10_GH0.tar.gz) = 99ccfd2270aebb09e5c1693094d1da5f47be09689fd515b623657f75e6dc2c40
+SIZE (uber-go-goleak-v1.1.10_GH0.tar.gz) = 12098
 SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b89d1a6684475fcbaed3f9d2137df072e2c1f7b15feb69a8ef8963804c44c94
 SIZE (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 164460
 SHA256 (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 98901cc41df77858a2f601ad48b45bdf72af40c56f15bc5182416b15db0daac3
 SIZE (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 31655
-SHA256 (gitlab-org-gitaly-80796c538e2c8f45d311914c3d7a6b22866a0758_GL0.tar.gz) = 6caa7d7f8ee04b9b455ba84fdd2a04ff16f6b79cd780ae02ac3b4c09c2a3541d
-SIZE (gitlab-org-gitaly-80796c538e2c8f45d311914c3d7a6b22866a0758_GL0.tar.gz) = 3396835
+SHA256 (gitlab-org-gitaly-538266fbaefe35385130e0f3c7b1865cec2a57b0_GL0.tar.gz) = 733010a94f91466721334683969d253abfa67dbc3d19b09475e99754b99a627a
+SIZE (gitlab-org-gitaly-538266fbaefe35385130e0f3c7b1865cec2a57b0_GL0.tar.gz) = 3459810
 SHA256 (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = 7f5b214e4bd2b72231462c3a153d9b416caab331a1a25a3ca5cd44b02ab9eb15
 SIZE (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = 89693
 SHA256 (gitlab-org-labkit-f2d7fb209ecad2eaddb5fb9c4ab03eb8eaa82811_GL0.tar.gz) = 0ac619ab0bfcbda29f80f0955e86c7ffa1adaa20c96ed546f53fb837633f5d90
 SIZE (gitlab-org-labkit-f2d7fb209ecad2eaddb5fb9c4ab03eb8eaa82811_GL0.tar.gz) = 141810
diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile
index a4245bea4471..ab17a26152bc 100644
--- a/devel/gitaly/files/patch-Makefile
+++ b/devel/gitaly/files/patch-Makefile
@@ -1,57 +1,49 @@
---- Makefile.orig	2021-03-17 18:58:25 UTC
+--- Makefile.orig	2021-04-22 21:08:06 UTC
 +++ Makefile
-@@ -51,7 +51,7 @@ GOLANGCI_LINT_OPTIONS ?=
- GOLANGCI_LINT_CONFIG  ?= ${SOURCE_DIR}/.golangci.yml
- 
- # Build information
--BUNDLE_FLAGS    ?= $(shell test -f ${SOURCE_DIR}/../.gdk-install-root && echo --no-deployment || echo --deployment)
-+BUNDLE_FLAGS    ?= $(shell test -f ${SOURCE_DIR}/../.gdk-install-root && echo --no-deployment || echo --local)
- GITALY_PACKAGE  := gitlab.com/gitlab-org/gitaly
- BUILD_TIME      := $(shell date +"%Y%m%d.%H%M%S")
- GITALY_VERSION  := $(shell git describe --match v* 2>/dev/null | sed 's/^v//' || cat ${SOURCE_DIR}/VERSION 2>/dev/null || echo unknown)
-@@ -190,7 +190,7 @@ all: INSTALL_DEST_DIR = ${SOURCE_DIR}
+@@ -197,7 +197,7 @@ all: INSTALL_DEST_DIR = ${SOURCE_DIR}
  all: install
  
  .PHONY: build
 -build: ${SOURCE_DIR}/.ruby-bundle libgit2
 +build: ${SOURCE_DIR}/.ruby-bundle
  	go install ${GO_LDFLAGS} -tags "${GO_BUILD_TAGS}" $(addprefix ${GITALY_PACKAGE}/cmd/, $(call find_commands))
  
  .PHONY: install
-@@ -228,7 +228,7 @@ assemble-ruby:
+@@ -235,7 +235,7 @@ assemble-ruby:
  .PHONY: binaries
  binaries: assemble
  	${Q}if [ ${ARCH} != 'x86_64' ]; then echo Incorrect architecture for build: ${ARCH}; exit 1; fi
 -	${Q}cd ${ASSEMBLY_ROOT} && sha256sum bin/* | tee checksums.sha256.txt
 +	${Q}cd ${ASSEMBLY_ROOT} && sha256 bin/* | tee checksums.sha256.txt
  
  .PHONY: prepare-tests
  prepare-tests: git libgit2 prepare-test-repos ${SOURCE_DIR}/.ruby-bundle
-@@ -381,8 +381,7 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a
+@@ -388,9 +388,7 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a
  # step. Both Omnibus and CNG assume it is in the Gitaly root, not in
  # _build. Hence the '../' in front.
  ${SOURCE_DIR}/.ruby-bundle: ${GITALY_RUBY_DIR}/Gemfile.lock ${GITALY_RUBY_DIR}/Gemfile
+-	${Q}cd ${GITALY_RUBY_DIR} && bundle config set --local deployment "${BUNDLE_DEPLOYMENT}"
 -	${Q}cd ${GITALY_RUBY_DIR} && bundle config # for debugging
--	${Q}cd ${GITALY_RUBY_DIR} && bundle install ${BUNDLE_FLAGS}
-+	${Q}cd ${GITALY_RUBY_DIR} && rm -f Gemfile.lock && bundle install ${BUNDLE_FLAGS}
+-	${Q}cd ${GITALY_RUBY_DIR} && bundle install
++	${Q}cd ${GITALY_RUBY_DIR} && rm -f Gemfile.lock && bundle install --local
  	${Q}touch $@
  
  ${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE
-@@ -445,7 +444,7 @@ ${GIT_INSTALL_DIR}/bin/git: ${DEPENDENCY_DIR}/git.vers
+@@ -457,7 +455,7 @@ endif
  else
  ${DEPENDENCY_DIR}/git_full_bins.tgz: ${DEPENDENCY_DIR}/git.version
  	curl -o $@.tmp --silent --show-error -L ${GIT_BINARIES_URL}
 -	${Q}printf '${GIT_BINARIES_HASH}  $@.tmp' | sha256sum -c -
 +	${Q}printf '${GIT_BINARIES_HASH}  $@.tmp' | sha256 -c -
  	${Q}mv $@.tmp $@
  
  ${GIT_INSTALL_DIR}/bin/git: ${DEPENDENCY_DIR}/git_full_bins.tgz
-@@ -458,7 +457,7 @@ ${TOOLS_DIR}/protoc.zip: TOOL_VERSION = ${PROTOC_VERSI
+@@ -470,7 +468,7 @@ ${TOOLS_DIR}/protoc.zip: TOOL_VERSION = ${PROTOC_VERSI
  ${TOOLS_DIR}/protoc.zip: ${TOOLS_DIR}/protoc.version
  	${Q}if [ -z "${PROTOC_URL}" ]; then echo "Cannot generate protos on unsupported platform ${OS}" && exit 1; fi
  	curl -o $@.tmp --silent --show-error -L ${PROTOC_URL}
 -	${Q}printf '${PROTOC_HASH}  $@.tmp' | sha256sum -c -
 +	${Q}printf '${PROTOC_HASH}  $@.tmp' | sha256 -c -
  	${Q}mv $@.tmp $@
  
  ${PROTOC}: ${TOOLS_DIR}/protoc.zip
diff --git a/devel/gitaly/files/patch-config.toml.example b/devel/gitaly/files/patch-config.toml.example
index 33a08e4486c2..758d0dcb28ce 100644
--- a/devel/gitaly/files/patch-config.toml.example
+++ b/devel/gitaly/files/patch-config.toml.example
@@ -1,69 +1,74 @@
---- config.toml.example.orig	2020-09-21 16:21:08 UTC
+--- config.toml.example.orig	2021-04-22 21:08:06 UTC
 +++ config.toml.example
 @@ -2,10 +2,10 @@
  # Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and
  # https://docs.gitlab.com/ee//administration/gitaly/reference
  
 -socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket"
 +socket_path = "%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/gitaly.socket"
  
  # The directory where Gitaly's executables are stored
 -bin_dir = "/home/git/gitaly"
 +bin_dir = "%%PREFIX%%/share/gitaly/bin/"
  
  # # Optional: listen on a TCP socket. This is insecure (no authentication)
  # listen_addr = "localhost:9999"
-@@ -29,13 +29,13 @@ bin_dir = "/home/git/gitaly"
+@@ -28,9 +28,9 @@ bin_dir = "/home/git/gitaly"
+ # certificate_path = '/home/git/cert.cert'
  # key_path = '/home/git/key.pem'
  
- # # Git settings
+-# # Git settings
 -# [git]
 -# bin_path = "/usr/bin/git"
++# Git settings
 +[git]
 +bin_path = "%%PREFIX%%/bin/git"
  # catfile_cache_size = 100
+ # [[git.config]]
+ # key = fetch.fsckObjects
+@@ -38,7 +38,7 @@ bin_dir = "/home/git/gitaly"
  
  [[storage]]
  name = "default"
 -path = "/home/git/repositories"
 +path = "%%PREFIX%%/git/repositories"
  
  # # You can optionally configure more storages for this Gitaly instance to serve up
  #
-@@ -47,7 +47,7 @@ path = "/home/git/repositories"
+@@ -50,7 +50,7 @@ path = "/home/git/repositories"
  # # You can optionally configure Gitaly to output JSON-formatted log messages to stdout
  # [logging]
  # # The directory where Gitaly stores extra log files
 -dir = "/home/git/gitlab/log"
 +dir = "%%PREFIX%%/www/gitlab-ce/log"
  # format = "json"
  # # Optional: Set log level to only log entries with that severity or above
  # # One of, in order: debug, info, warn, errror, fatal, panic
-@@ -65,7 +65,7 @@ dir = "/home/git/gitlab/log"
+@@ -68,7 +68,7 @@ dir = "/home/git/gitlab/log"
  
  [gitaly-ruby]
  # The directory where gitaly-ruby is installed
 -dir = "/home/git/gitaly/ruby"
 +dir = "%%PREFIX%%/share/gitaly/ruby"
  
  # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes)
  # max_rss = 200000000
-@@ -85,14 +85,14 @@ dir = "/home/git/gitaly/ruby"
+@@ -88,14 +88,14 @@ dir = "/home/git/gitaly/ruby"
  
  [gitlab-shell]
  # The directory where gitlab-shell is installed
 -dir = "/home/git/gitlab-shell"
 +dir = "%%PREFIX%%/share/gitlab-shell"
  
  [hooks]
 -custom_hooks_dir = "/home/git/custom_hooks"
 +custom_hooks_dir = "%%PREFIX%%/git/custom_hooks"
  
  [gitlab]
 -secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret"
 -url = "http+unix://%2Fhome%2Fgit%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket"
 +secret_file = "%%PREFIX%%/share/gitlab-shell/.gitlab_shell_secret"
 +url = "http+unix://%2Fusr%2Flocal%2Fwww%2Fgitlab-ce%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket"
  # Only needed if a UNIX socket is used in `url` and GitLab is configured to
  # use a relative path (e.g. /gitlab).
  # relative_url_root = '/'
diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile
index 1edec7ee3614..86bfa219997c 100644
--- a/devel/gitaly/files/patch-ruby_Gemfile
+++ b/devel/gitaly/files/patch-ruby_Gemfile
@@ -1,26 +1,16 @@
---- ruby/Gemfile.orig	2021-03-17 18:58:25 UTC
+--- ruby/Gemfile.orig	2021-04-22 21:08:06 UTC
 +++ ruby/Gemfile
-@@ -13,21 +13,11 @@ gem 'faraday', '~> 1.0'
- gem 'rbtrace', require: false
+@@ -21,13 +21,3 @@ gem 'licensee', '~> 9.14.1'
  
- # Labkit provides observability functionality
--gem 'gitlab-labkit', '~> 0.15.0'
-+gem 'gitlab-labkit', '~> 0.16.1'
- 
- # Detects the open source license the repository includes
- # This version needs to be in sync with GitLab CE/EE
- gem 'licensee', '~> 9.14.1'
- 
--gem 'google-protobuf', '~> 3.12'
-+gem 'google-protobuf', '~> 3.14.0'
+ gem 'google-protobuf', '~> 3.14.0'
  
 -group :development, :test do
 -  gem 'rubocop', '~> 0.69', require: false
 -  gem 'rspec', require: false
 -  gem 'rspec-parameterized', require: false
 -  gem 'timecop', require: false
 -  gem 'factory_bot', require: false
 -  gem 'pry', '~> 0.12.2', require: false
 -
 -  gem 'grpc-tools', '= 1.30.2'
 -end