aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/gitaly/Makefile4
-rw-r--r--devel/gitaly/distinfo6
-rw-r--r--www/gitlab-ce/Makefile4
-rw-r--r--www/gitlab-ce/distinfo6
-rw-r--r--www/gitlab-ce/pkg-message4
-rw-r--r--www/gitlab-ce/pkg-plist3
-rw-r--r--www/gitlab-workhorse/Makefile4
-rw-r--r--www/gitlab-workhorse/distinfo6
8 files changed, 20 insertions, 17 deletions
diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 1d92ef4693bd..6f226c8370d5 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitaly
-DISTVERSION= 13.12.0
+DISTVERSION= 13.12.1
PORTREVISION= 0
CATEGORIES= devel
@@ -43,7 +43,7 @@ MAKE_ENV+= ${GO_ENV}
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
# Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags
-GL_COMMIT= bc0e6dd857ea2a2c3cfdcca10448e5da93ed2aad
+GL_COMMIT= ae8d1970cf9eb2b46f1453d11292f86b7ab56056
# for go dependencies
USE_GITHUB= nodefault
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 3838a5b2479d..de68c459160b 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1621967080
+TIMESTAMP = 1622303430
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
@@ -169,8 +169,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-bc0e6dd857ea2a2c3cfdcca10448e5da93ed2aad_GL0.tar.gz) = b3601f0c82e4cdb5264f035162e138eace145522335131f6ac816eee1eda5ec0
-SIZE (gitlab-org-gitaly-bc0e6dd857ea2a2c3cfdcca10448e5da93ed2aad_GL0.tar.gz) = 3462729
+SHA256 (gitlab-org-gitaly-ae8d1970cf9eb2b46f1453d11292f86b7ab56056_GL0.tar.gz) = 09cb8b24ad183865fab8335557f24d29a6d666229b51ea72a23b89e33d0bd373
+SIZE (gitlab-org-gitaly-ae8d1970cf9eb2b46f1453d11292f86b7ab56056_GL0.tar.gz) = 3462676
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
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index c5ed8c2cf726..612725d03b89 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -1,7 +1,7 @@
# Created by: Torsten Zuehlsdorff <tz@FreeBSD.org>
PORTNAME= gitlab-ce
-PORTVERSION= 13.12.0
+PORTVERSION= 13.12.1
PORTREVISION= 0
CATEGORIES= www devel
@@ -271,7 +271,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?= e1c4542b0f1ad29c1f21bc17de191df99b99b1a3
+GL_COMMIT?= bec931306a784792a7a1faa44e0db338fa34b3ee
USERS= git
GROUPS= git
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index b29f5557bce4..08e571a76a33 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621967009
-SHA256 (gitlab-org-gitlab-foss-e1c4542b0f1ad29c1f21bc17de191df99b99b1a3_GL0.tar.gz) = a67c1cc5b9c79111f2816bc07d04034542651148b55f10c6e9a13c6fc934fe9f
-SIZE (gitlab-org-gitlab-foss-e1c4542b0f1ad29c1f21bc17de191df99b99b1a3_GL0.tar.gz) = 95961347
+TIMESTAMP = 1622303316
+SHA256 (gitlab-org-gitlab-foss-bec931306a784792a7a1faa44e0db338fa34b3ee_GL0.tar.gz) = 4b9c9638b7eaeab39525a7ccbeb35c6da49d0f3cc1348614609960bc1a62638d
+SIZE (gitlab-org-gitlab-foss-bec931306a784792a7a1faa44e0db338fa34b3ee_GL0.tar.gz) = 95965567
diff --git a/www/gitlab-ce/pkg-message b/www/gitlab-ce/pkg-message
index 6d8aed9eb796..a83e87413c5b 100644
--- a/www/gitlab-ce/pkg-message
+++ b/www/gitlab-ce/pkg-message
@@ -6,7 +6,7 @@ Gitlab was installed successfully.
You now need to set up the various components of Gitlab, so please
follow the instructions in the guide at:
-https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/13.11-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/13.12-freebsd.md
EOM
type: install
}
@@ -20,7 +20,7 @@ EOM
If you just installed an major upgrade of GitLab, for example you
switched from 12.6.x to 12.7.x, please follow the instructions in the guide at:
-https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/13.10-13.11-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/13.11-13.12-freebsd.md
If you just installed an minor upgrade of GitLab please follow
the instructions in the guide at:
diff --git a/www/gitlab-ce/pkg-plist b/www/gitlab-ce/pkg-plist
index 9a0b41b37098..d61836c07e57 100644
--- a/www/gitlab-ce/pkg-plist
+++ b/www/gitlab-ce/pkg-plist
@@ -12936,6 +12936,7 @@
%%WWWDIR%%/data/whats_new/202102180001_13_09.yml
%%WWWDIR%%/data/whats_new/202103220001_13_10.yml
%%WWWDIR%%/data/whats_new/202104220001_13_11.yml
+%%WWWDIR%%/data/whats_new/202105220001_13_12.yml
%%WWWDIR%%/data/whats_new/templates/YYYYMMDD0001_XX_YY.yml
%%WWWDIR%%/db/fixtures/development/01_admin.rb
%%WWWDIR%%/db/fixtures/development/02_application_settings.rb
@@ -18652,6 +18653,7 @@
%%WWWDIR%%/doc/user/admin_area/settings/continuous_integration.md
%%WWWDIR%%/doc/user/admin_area/settings/email.md
%%WWWDIR%%/doc/user/admin_area/settings/external_authorization.md
+%%WWWDIR%%/doc/user/admin_area/settings/floc.md
%%WWWDIR%%/doc/user/admin_area/settings/gitaly_timeouts.md
%%WWWDIR%%/doc/user/admin_area/settings/help_page.md
%%WWWDIR%%/doc/user/admin_area/settings/img/admin_package_registry_npm_package_requests_forward.png
@@ -27176,6 +27178,7 @@
%%WWWDIR%%/spec/fixtures/emails/merge_request_with_patch_and_target_branch.eml
%%WWWDIR%%/spec/fixtures/emails/newlines.eml
%%WWWDIR%%/spec/fixtures/emails/no_content_reply.eml
+%%WWWDIR%%/spec/fixtures/emails/no_content_type.eml
%%WWWDIR%%/spec/fixtures/emails/on_wrote.eml
%%WWWDIR%%/spec/fixtures/emails/outlook.eml
%%WWWDIR%%/spec/fixtures/emails/outlook_html.eml
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index e4b7709c67dd..2bcdf3c60788 100644
--- a/www/gitlab-workhorse/Makefile
+++ b/www/gitlab-workhorse/Makefile
@@ -1,7 +1,7 @@
# Created by: Torsten Zuehlsdorff <tz@FreeBSD.org>
PORTNAME?= gitlab-workhorse
-PORTVERSION?= 13.12.0
+PORTVERSION?= 13.12.1
PORTREVISION?= 0
CATEGORIES= www
@@ -23,7 +23,7 @@ USE_GITLAB= yes
GL_ACCOUNT?= gitlab-org
GL_PROJECT= gitlab-foss
# Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags
-GL_COMMIT?= e1c4542b0f1ad29c1f21bc17de191df99b99b1a3
+GL_COMMIT?= bec931306a784792a7a1faa44e0db338fa34b3ee
# for go dependencies
USE_GITHUB= nodefault
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index 04c41d1a6f25..fc741dd3c4a8 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1621967034
+TIMESTAMP = 1622303394
SHA256 (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 99bd58f4a07dd02d9615e3638b3bb6dbfad80ef678ccdb8e17e3fa2b0fef343e
SIZE (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 17102
SHA256 (Azure-azure-storage-blob-go-6df5d9af221d_GH0.tar.gz) = 31047920e4c507f913b9922ad920a2e9f6d48e6056bdc6869b6c257e3ab095a7
@@ -181,8 +181,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-gitlab-foss-e1c4542b0f1ad29c1f21bc17de191df99b99b1a3_GL0.tar.gz) = a67c1cc5b9c79111f2816bc07d04034542651148b55f10c6e9a13c6fc934fe9f
-SIZE (gitlab-org-gitlab-foss-e1c4542b0f1ad29c1f21bc17de191df99b99b1a3_GL0.tar.gz) = 95961347
+SHA256 (gitlab-org-gitlab-foss-bec931306a784792a7a1faa44e0db338fa34b3ee_GL0.tar.gz) = 4b9c9638b7eaeab39525a7ccbeb35c6da49d0f3cc1348614609960bc1a62638d
+SIZE (gitlab-org-gitlab-foss-bec931306a784792a7a1faa44e0db338fa34b3ee_GL0.tar.gz) = 95965567
SHA256 (gitlab-org-gitaly-3f5e218def93024f3aafe590c22cd1b29f744105_GL0.tar.gz) = 000027af9d1bca6db30bb4e0b27fcb4b6315ae7c0787639c044eaa449fc3d8d0
SIZE (gitlab-org-gitaly-3f5e218def93024f3aafe590c22cd1b29f744105_GL0.tar.gz) = 3145584
SHA256 (gitlab-org-labkit-f2d7fb209ecad2eaddb5fb9c4ab03eb8eaa82811_GL0.tar.gz) = 0ac619ab0bfcbda29f80f0955e86c7ffa1adaa20c96ed546f53fb837633f5d90
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 22:35:58 +0000