Security update to 13.1.2.

Changelog:
https://about.gitlab.com/releases/2020/07/01/security-release-13-1-2-release/

MFH:		2020Q3
Security:	0a305431-bc98-11ea-a051-001b217b3468

5 files changed, 16 insertions, 12 deletions

diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index e8870d129a76..f28335894f72 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitaly
-DISTVERSION=	13.1.1
+DISTVERSION=	13.1.2
 PORTREVISION=	0
 CATEGORIES=	devel
 
@@ -42,7 +42,7 @@ MAKE_ENV=	GOFLAGS="${GO_BUILDFLAGS}"
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags
-GL_COMMIT=	0fb7caf0703e3f78085054c367dcba9f640140de
+GL_COMMIT=	26cde441322fc0f7b51c62cda6073d4c474f2163
 
 # for go dependencies
 USE_GITHUB=	nodefault
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 715bb8f741d9..f4e9c89ef09c 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1593444209
+TIMESTAMP = 1593717137
 SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
 SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
 SHA256 (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = d81bd47683ef9cbd228691b077373d3e15ca5fa5b9e7919099c4e87779040e84
@@ -99,8 +99,8 @@ SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b89d1a6684475fcbaed3f9d2137
 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-0fb7caf0703e3f78085054c367dcba9f640140de_GL0.tar.gz) = b2b8315f3287154c12c51d566a7b9cc5347a271c92292aed5d14855965dbd862
-SIZE (gitlab-org-gitaly-0fb7caf0703e3f78085054c367dcba9f640140de_GL0.tar.gz) = 3022370
+SHA256 (gitlab-org-gitaly-26cde441322fc0f7b51c62cda6073d4c474f2163_GL0.tar.gz) = ce632231a1f1d5c3e87263ca0f115b04c15ebb3af7ccecfb776deeea17e47e90
+SIZE (gitlab-org-gitaly-26cde441322fc0f7b51c62cda6073d4c474f2163_GL0.tar.gz) = 3022406
 SHA256 (gitlab-org-gitlab-shell-716e30c55e893ebe2385b27f85902a789f26c6ef_GL0.tar.gz) = 9a2a40a6c44802b1de7ff46bc9c6bc97c8be179d0ca4fe755c22044650d3f84c
 SIZE (gitlab-org-gitlab-shell-716e30c55e893ebe2385b27f85902a789f26c6ef_GL0.tar.gz) = 65840
 SHA256 (gitlab-org-labkit-0149780c759d60f61fcfe1648fb882ba7ec41f3f_GL0.tar.gz) = fa3a9e6a6da58375427ee1814d95dba8d55bee13537492bba19480eae772ab95
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index 80df32f4fecb..6c97e2f13cd5 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab-ce
-PORTVERSION=	13.1.1
+PORTVERSION=	13.1.2
 PORTREVISION=	0
 CATEGORIES=	www devel
 
@@ -82,7 +82,7 @@ MY_DEPENDS=	git>=2.25:devel/git \
 	rubygem-apollo_upload_server>=2.0.0.b.3<2.1.0:net/rubygem-apollo_upload_server \
 	rubygem-graphql-docs>=1.6.0<1.7.0:devel/rubygem-graphql-docs \
 	rubygem-hashie-forbidden_attributes>0:devel/rubygem-hashie-forbidden_attributes \
-	rubygem-kaminari-rails60>=1.0<2.0:www/rubygem-kaminari-rails60 \
+	rubygem-kaminari-rails60>=1.2.1<2.0:www/rubygem-kaminari-rails60 \
 	rubygem-hamlit>=2.11.0<2.12.0:www/rubygem-hamlit \
 	rubygem-carrierwave>=1.3<2.0:www/rubygem-carrierwave \
 	rubygem-mini_magick>0:graphics/rubygem-mini_magick \
@@ -251,7 +251,7 @@ USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 GL_PROJECT=	gitlab-foss
 # Find the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags
-GL_COMMIT=	bdb9883705a46a924818c26317268b95ea3f9e12
+GL_COMMIT=	2e7a6f64b07d018acbf2d42e5cc4c5224e4e8b42
 SHEBANG_FILES=	bin/background_* scripts/build_assets_image scripts/clean-old-cached-assets scripts/create_postgres_user.sh scripts/prepare_postgres_fdw.sh scripts/review_apps/gcp_cleanup.sh scripts/rspec_helpers.sh scripts/security-harness
 
 USERS=	git
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index 0d20ed5eadd0..552abbcc642a 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1593443607
-SHA256 (gitlab-org-gitlab-foss-bdb9883705a46a924818c26317268b95ea3f9e12_GL0.tar.gz) = 1ce7d6c744eac44d6033aefde83b114a6a75db607cc9942a4c9d009144418547
-SIZE (gitlab-org-gitlab-foss-bdb9883705a46a924818c26317268b95ea3f9e12_GL0.tar.gz) = 92929183
+TIMESTAMP = 1593716963
+SHA256 (gitlab-org-gitlab-foss-2e7a6f64b07d018acbf2d42e5cc4c5224e4e8b42_GL0.tar.gz) = 6dd160f4c228bdae549cb53efc466a91d5ec7e7e4b38c02a63f1bdb75078849e
+SIZE (gitlab-org-gitlab-foss-2e7a6f64b07d018acbf2d42e5cc4c5224e4e8b42_GL0.tar.gz) = 92846051
diff --git a/www/gitlab-ce/pkg-plist b/www/gitlab-ce/pkg-plist
index dd038ef641f0..9d26f46116f7 100644
--- a/www/gitlab-ce/pkg-plist
+++ b/www/gitlab-ce/pkg-plist
@@ -66,7 +66,6 @@
 %%WWWDIR%%/.stylelintrc
 %%WWWDIR%%/.vale.ini
 %%WWWDIR%%/.yamllint
-%%WWWDIR%%/CHANGELOG-EE.md
 %%WWWDIR%%/CHANGELOG.md
 %%WWWDIR%%/CONTRIBUTING.md
 %%WWWDIR%%/Dangerfile
@@ -6680,6 +6679,7 @@
 %%WWWDIR%%/app/services/snippets/count_service.rb
 %%WWWDIR%%/app/services/snippets/create_service.rb
 %%WWWDIR%%/app/services/snippets/destroy_service.rb
+%%WWWDIR%%/app/services/snippets/repository_validation_service.rb
 %%WWWDIR%%/app/services/snippets/update_service.rb
 %%WWWDIR%%/app/services/spam/akismet_service.rb
 %%WWWDIR%%/app/services/spam/ham_service.rb
@@ -6775,6 +6775,7 @@
 %%WWWDIR%%/app/validators/cron_validator.rb
 %%WWWDIR%%/app/validators/devise_email_validator.rb
 %%WWWDIR%%/app/validators/duration_validator.rb
+%%WWWDIR%%/app/validators/html_safety_validator.rb
 %%WWWDIR%%/app/validators/js_regex_validator.rb
 %%WWWDIR%%/app/validators/json_schema_validator.rb
 %%WWWDIR%%/app/validators/json_schemas/build_report_result_data.json
@@ -20755,6 +20756,7 @@
 %%WWWDIR%%/spec/initializers/asset_proxy_setting_spec.rb
 %%WWWDIR%%/spec/initializers/attr_encrypted_no_db_connection_spec.rb
 %%WWWDIR%%/spec/initializers/attr_encrypted_thread_safe_spec.rb
+%%WWWDIR%%/spec/initializers/cookies_serializer_spec.rb
 %%WWWDIR%%/spec/initializers/database_config_spec.rb
 %%WWWDIR%%/spec/initializers/direct_upload_support_spec.rb
 %%WWWDIR%%/spec/initializers/doorkeeper_spec.rb
@@ -23762,6 +23764,7 @@
 %%WWWDIR%%/spec/services/snippets/count_service_spec.rb
 %%WWWDIR%%/spec/services/snippets/create_service_spec.rb
 %%WWWDIR%%/spec/services/snippets/destroy_service_spec.rb
+%%WWWDIR%%/spec/services/snippets/repository_validation_service_spec.rb
 %%WWWDIR%%/spec/services/snippets/update_service_spec.rb
 %%WWWDIR%%/spec/services/spam/akismet_service_spec.rb
 %%WWWDIR%%/spec/services/spam/ham_service_spec.rb
@@ -24424,6 +24427,7 @@
 %%WWWDIR%%/spec/validators/cron_freeze_period_timezone_validator_spec.rb
 %%WWWDIR%%/spec/validators/cron_validator_spec.rb
 %%WWWDIR%%/spec/validators/devise_email_validator_spec.rb
+%%WWWDIR%%/spec/validators/html_safety_validator_spec.rb
 %%WWWDIR%%/spec/validators/js_regex_validator_spec.rb
 %%WWWDIR%%/spec/validators/json_schema_validator_spec.rb
 %%WWWDIR%%/spec/validators/named_ecdsa_key_validator_spec.rb