Index: branches/2018Q4/devel/gitaly/Makefile
===================================================================
--- branches/2018Q4/devel/gitaly/Makefile	(revision 483791)
+++ branches/2018Q4/devel/gitaly/Makefile	(revision 483792)
@@ -1,63 +1,64 @@
 # $FreeBSD$
 
 PORTNAME=	gitaly
-DISTVERSION=	0.120.1
+DISTVERSION=	0.125.1
+PORTREVISION=	1
 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.17:devel/git \
 		rubygem-i18n>=0:devel/rubygem-i18n \
 		rubygem-rugged>=0.27.4:devel/rubygem-rugged \
 		rubygem-github-linguist53>=5.3.3:textproc/rubygem-github-linguist53 \
 		rubygem-bundler>0:sysutils/rubygem-bundler \
 		rubygem-gitlab-markup>=1.6.4:textproc/rubygem-gitlab-markup \
 		rubygem-gitaly-proto>=0.107.0:net/rubygem-gitaly-proto \
 		rubygem-activesupport50>=5.0.2:devel/rubygem-activesupport50 \
 		rubygem-rdoc>=6.0:devel/rubygem-rdoc \
 		rubygem-gitlab-gollum-lib>=4.2:www/rubygem-gitlab-gollum-lib \
 		rubygem-gitlab-gollum-rugged_adapter>=0.4.4:www/rubygem-gitlab-gollum-rugged_adapter \
 		rubygem-grpc>=1.11.0:net/rubygem-grpc \
 		rubygem-sentry-raven>=2.7.2:devel/rubygem-sentry-raven \
 		rubygem-faraday>=0.12:www/rubygem-faraday \
 		rubygem-licensee8>=8.9.0:devel/rubygem-licensee8 \
 		rubygem-google-protobuf351>=3.5.1:devel/rubygem-google-protobuf351
 
 BUILD_DEPENDS=	go>=1.9:lang/go \
 		gem:devel/ruby-gems \
 		${MY_DEPENDS}
 
 RUN_DEPENDS=	${MY_DEPENDS} \
 		gitlab-shell>=6.0.4:devel/gitlab-shell
 
 USES=		gmake
 USE_RUBY=	yes
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find this here: https://gitlab.com/gitlab-org/gitaly/tags
-GL_COMMIT=	5a739d657452de73137c2a0cb7d171c40fa3557a
+GL_COMMIT=	076f3b0710ac07af5530ff20618e3fc27a5aead7
 
 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
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/bin/gitaly
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/bin/gitaly-ssh
 
 .include <bsd.port.mk>
Index: branches/2018Q4/devel/gitaly/distinfo
===================================================================
--- branches/2018Q4/devel/gitaly/distinfo	(revision 483791)
+++ branches/2018Q4/devel/gitaly/distinfo	(revision 483792)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538419557
-SHA256 (gitlab-org-gitaly-5a739d657452de73137c2a0cb7d171c40fa3557a_GL0.tar.gz) = 1bc5e27bef1ae2ff6c69f8a04afbd8db954562d3888398226e281a4004ea5ea0
-SIZE (gitlab-org-gitaly-5a739d657452de73137c2a0cb7d171c40fa3557a_GL0.tar.gz) = 3608844
+TIMESTAMP = 1540328037
+SHA256 (gitlab-org-gitaly-076f3b0710ac07af5530ff20618e3fc27a5aead7_GL0.tar.gz) = 7d4f62b68b5e8b587024a3db5833285068bb25d77b3f40c440bbeb3a9d9418f0
+SIZE (gitlab-org-gitaly-076f3b0710ac07af5530ff20618e3fc27a5aead7_GL0.tar.gz) = 3603356
Index: branches/2018Q4/devel/gitaly/files/patch-ruby_Gemfile
===================================================================
--- branches/2018Q4/devel/gitaly/files/patch-ruby_Gemfile	(revision 483791)
+++ branches/2018Q4/devel/gitaly/files/patch-ruby_Gemfile	(revision 483792)
@@ -1,32 +1,32 @@
 --- ruby/Gemfile.orig	2018-09-07 08:03:54 UTC
 +++ ruby/Gemfile
 @@ -1,16 +1,17 @@
  source 'https://rubygems.org'
  
  gem 'rugged', '~> 0.27.4'
 -gem 'github-linguist', '~> 6.1', require: 'linguist'
 +gem 'github-linguist', '~> 5.3', require: 'linguist'
  gem 'gitlab-markup', '~> 1.6.4'
 -gem 'gitaly-proto', '~> 0.116.0', require: 'gitaly'
-+gem 'gitaly-proto', '~> 0.117.0', require: 'gitaly'
++gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly'
  gem 'activesupport', '~> 5.0.2'
 -gem 'rdoc', '~> 4.2'
 +gem 'rdoc', '~> 6.0'
  gem 'gitlab-gollum-lib', '~> 4.2', require: false
  gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false
  gem 'grpc', '~> 1.11.0'
  gem 'sentry-raven', '~> 2.7.2', require: false
  gem 'faraday', '~> 0.12'
 +gem 'i18n'
  
  # Detects the open source license the repository includes
  # This version needs to be in sync with GitLab CE/EE
 @@ -18,8 +19,3 @@ gem 'licensee', '~> 8.9.0'
  
  # Locked until https://github.com/google/protobuf/issues/4210 is closed
  gem 'google-protobuf', '= 3.5.1'
 -
 -group :development, :test do
 -  gem 'gitlab-styles', '~> 2.0.0', require: false
 -  gem 'rspec', require: false
 -end
Index: branches/2018Q4/devel/gitaly/pkg-plist
===================================================================
--- branches/2018Q4/devel/gitaly/pkg-plist	(revision 483791)
+++ branches/2018Q4/devel/gitaly/pkg-plist	(revision 483792)
@@ -1,91 +1,81 @@
 %%DATADIR%%/ruby/Gemfile
 %%DATADIR%%/ruby/README.md
 @(,,555) %%DATADIR%%/ruby/bin/gitaly-ruby
 @(,,555) %%DATADIR%%/ruby/bin/ruby-cd
 %%DATADIR%%/ruby/lib/gitaly_server.rb
 %%DATADIR%%/ruby/lib/gitaly_server/blob_service.rb
 %%DATADIR%%/ruby/lib/gitaly_server/client.rb
 %%DATADIR%%/ruby/lib/gitaly_server/commit_service.rb
 %%DATADIR%%/ruby/lib/gitaly_server/conflicts_service.rb
 %%DATADIR%%/ruby/lib/gitaly_server/diff_service.rb
 %%DATADIR%%/ruby/lib/gitaly_server/exception_sanitizer_interceptor.rb
 %%DATADIR%%/ruby/lib/gitaly_server/health_service.rb
 %%DATADIR%%/ruby/lib/gitaly_server/operations_service.rb
 %%DATADIR%%/ruby/lib/gitaly_server/ref_service.rb
 %%DATADIR%%/ruby/lib/gitaly_server/remote_service.rb
 %%DATADIR%%/ruby/lib/gitaly_server/repository_service.rb
 %%DATADIR%%/ruby/lib/gitaly_server/sentry.rb
 %%DATADIR%%/ruby/lib/gitaly_server/sentry_interceptor.rb
 %%DATADIR%%/ruby/lib/gitaly_server/utils.rb
 %%DATADIR%%/ruby/lib/gitaly_server/wiki_service.rb
 %%DATADIR%%/ruby/lib/gitlab/config.rb
+%%DATADIR%%/ruby/lib/gitlab/encoding_helper.rb
 %%DATADIR%%/ruby/lib/gitlab/git.rb
 %%DATADIR%%/ruby/lib/gitlab/git/blob.rb
 %%DATADIR%%/ruby/lib/gitlab/git/branch.rb
 %%DATADIR%%/ruby/lib/gitlab/git/commit.rb
 %%DATADIR%%/ruby/lib/gitlab/git/commit_stats.rb
+%%DATADIR%%/ruby/lib/gitlab/git/committer_with_hooks.rb
+%%DATADIR%%/ruby/lib/gitlab/git/conflict/file.rb
+%%DATADIR%%/ruby/lib/gitlab/git/conflict/parser.rb
+%%DATADIR%%/ruby/lib/gitlab/git/conflict/resolution.rb
 %%DATADIR%%/ruby/lib/gitlab/git/conflict/resolver.rb
 %%DATADIR%%/ruby/lib/gitlab/git/diff.rb
 %%DATADIR%%/ruby/lib/gitlab/git/gitaly_remote_repository.rb
 %%DATADIR%%/ruby/lib/gitlab/git/gitlab_projects.rb
+%%DATADIR%%/ruby/lib/gitlab/git/hook.rb
+%%DATADIR%%/ruby/lib/gitlab/git/hooks_service.rb
 %%DATADIR%%/ruby/lib/gitlab/git/index.rb
 %%DATADIR%%/ruby/lib/gitlab/git/lfs_changes.rb
-%%DATADIR%%/ruby/lib/gitlab/git/pre_receive_error.rb
+%%DATADIR%%/ruby/lib/gitlab/git/operation_service.rb
+%%DATADIR%%/ruby/lib/gitlab/git/path_helper.rb
+%%DATADIR%%/ruby/lib/gitlab/git/popen.rb
 %%DATADIR%%/ruby/lib/gitlab/git/raw_diff_change.rb
 %%DATADIR%%/ruby/lib/gitlab/git/ref.rb
 %%DATADIR%%/ruby/lib/gitlab/git/remote_mirror.rb
+%%DATADIR%%/ruby/lib/gitlab/git/remote_repository.rb
 %%DATADIR%%/ruby/lib/gitlab/git/repository.rb
 %%DATADIR%%/ruby/lib/gitlab/git/repository_mirroring.rb
 %%DATADIR%%/ruby/lib/gitlab/git/rev_list.rb
 %%DATADIR%%/ruby/lib/gitlab/git/tag.rb
+%%DATADIR%%/ruby/lib/gitlab/git/user.rb
 %%DATADIR%%/ruby/lib/gitlab/git/wiki.rb
 %%DATADIR%%/ruby/lib/gitlab/git/wiki_file.rb
 %%DATADIR%%/ruby/lib/gitlab/git/wiki_page.rb
 %%DATADIR%%/ruby/lib/gitlab/git/wiki_page_version.rb
 %%DATADIR%%/ruby/lib/gitlab/git_logger.rb
-%%DATADIR%%/ruby/lib/gitlab/gitaly_client.rb
 %%DATADIR%%/ruby/lib/gitlab/gollum.rb
 %%DATADIR%%/ruby/lib/gitlab/rails_logger.rb
+%%DATADIR%%/ruby/lib/gitlab/utils/strong_memoize.rb
 %%DATADIR%%/ruby/lib/gitlab/version_info.rb
 %%DATADIR%%/ruby/spec/gitaly/ref_service_spec.rb
 %%DATADIR%%/ruby/spec/gitaly/repository_service_spec.rb
 %%DATADIR%%/ruby/spec/integration_helper.rb
 %%DATADIR%%/ruby/spec/lib/gitaly_server/exception_sanitizer_interceptor_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitaly_server/utils_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitaly_server/sentry/url_sanitizer_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitaly_server/sentry_interceptor_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitlab/config_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitlab/git/diff_spec.rb
+%%DATADIR%%/ruby/spec/lib/gitlab/git/gitlab_projects_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitlab/git/index_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitlab/git/repository_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitlab/git/rev_list_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitlab/git/wiki_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitlab/version_info_spec.rb
 %%DATADIR%%/ruby/spec/spec_helper.rb
 %%DATADIR%%/ruby/spec/support/sentry.rb
 %%DATADIR%%/ruby/spec/test_repo_helper.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/ORIGIN
-%%DATADIR%%/ruby/vendor/gitlab_git/REVISION
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/encoding_helper.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/committer_with_hooks.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/conflict/file.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/conflict/parser.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/conflict/resolution.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/gitlab_projects.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/hook.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/hooks_service.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/operation_service.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/path_helper.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/popen.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/pre_receive_error.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/remote_mirror.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/remote_repository.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/repository.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/repository_mirroring.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/user.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/git/util.rb
-%%DATADIR%%/ruby/vendor/gitlab_git/lib/gitlab/utils/strong_memoize.rb
 @(,,555) %%DATADIR%%/bin/gitaly
 @(,,555) %%DATADIR%%/bin/gitaly-ssh
 @sample %%DATADIR%%/config.toml.sample
Index: branches/2018Q4
===================================================================
--- branches/2018Q4	(revision 483791)
+++ branches/2018Q4	(revision 483792)

Property changes on: branches/2018Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r482097,483497