Index: branches/2018Q3/devel/gitlab-shell/Makefile
===================================================================
--- branches/2018Q3/devel/gitlab-shell/Makefile	(revision 474949)
+++ branches/2018Q3/devel/gitlab-shell/Makefile	(revision 474950)
@@ -1,43 +1,44 @@
 # Created by: Torsten Zuehlsdorff <tz@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gitlab-shell
-PORTVERSION=	7.1.2
+PORTVERSION=	7.1.4
 CATEGORIES=	devel
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	GitLab Shell handles git commands for GitLab
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	gem:devel/ruby-gems \
 		go>=1.5.3:lang/go
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-shell/tags
-GL_COMMIT=	3a83767f650f996ef37382a21d05d8ed99873aa1
+GL_COMMIT=	6a15f1db609acd6b7dadb2a88d4f5aff3500f160
 
 USERS=		git
 GROUPS=		git
 
 INSTALL_TARGET=install-strip
 
 post-patch:
 	${MV} ${WRKSRC}/config.yml.example ${WRKSRC}/config.yml.sample
 
 do-build:
 	export GOCACHE=${WRKSRC}/go && ${WRKSRC}/bin/compile
 
 pre-install:
 	${RM} -rf ${WRKSRC}/go
 	${RM} -rf ${WRKSRC}/go_build
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 	@${MKDIR} ${STAGEDIR}/var/log/gitlab-shell
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/bin/gitaly-upload-pack
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/bin/gitaly-receive-pack
+	${STRIP_CMD} ${STAGEDIR}${DATADIR}/bin/gitaly-upload-archive
 
 .include <bsd.port.mk>
Index: branches/2018Q3/devel/gitlab-shell/distinfo
===================================================================
--- branches/2018Q3/devel/gitlab-shell/distinfo	(revision 474949)
+++ branches/2018Q3/devel/gitlab-shell/distinfo	(revision 474950)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524408426
-SHA256 (gitlab-org-gitlab-shell-3a83767f650f996ef37382a21d05d8ed99873aa1_GL0.tar.gz) = 6db5b6c4d0269d2510841add69bf78690ef67534fe5f83fb131fa1368a8d011d
-SIZE (gitlab-org-gitlab-shell-3a83767f650f996ef37382a21d05d8ed99873aa1_GL0.tar.gz) = 1547242
+TIMESTAMP = 1530371268
+SHA256 (gitlab-org-gitlab-shell-6a15f1db609acd6b7dadb2a88d4f5aff3500f160_GL0.tar.gz) = 7d3a5e1380b575f24194022499889f06bc81d84edb2df2fab4e4651fb77b6cf4
+SIZE (gitlab-org-gitlab-shell-6a15f1db609acd6b7dadb2a88d4f5aff3500f160_GL0.tar.gz) = 1547952
Index: branches/2018Q3
===================================================================
--- branches/2018Q3	(revision 474949)
+++ branches/2018Q3	(revision 474950)

Property changes on: branches/2018Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r473907