aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/gitaly/Makefile4
-rw-r--r--devel/gitaly/distinfo6
-rw-r--r--www/gitlab-ce/Makefile6
-rw-r--r--www/gitlab-ce/distinfo6
-rw-r--r--www/gitlab-ce/pkg-plist4
-rw-r--r--www/gitlab-workhorse/Makefile4
-rw-r--r--www/gitlab-workhorse/distinfo6
7 files changed, 19 insertions, 17 deletions
diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index b9a72336748c..7a6c5560a050 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitaly
-DISTVERSION= 13.11.3
+DISTVERSION= 13.11.4
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= a14e84bce77ea1f18aded23636cf1853f84a7b3c
+GL_COMMIT= aa388adb235751f446f3ed9ec54a46e65d8e3901
# for go dependencies
USE_GITHUB= nodefault
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 8ccb1a642aa7..5481808b33fa 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1620332586
+TIMESTAMP = 1621231236
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-a14e84bce77ea1f18aded23636cf1853f84a7b3c_GL0.tar.gz) = e9e7603f521b3a0f4fdc66a13d59043bb928fbd6dbe93ccdbaf565e7dadbc501
-SIZE (gitlab-org-gitaly-a14e84bce77ea1f18aded23636cf1853f84a7b3c_GL0.tar.gz) = 3459962
+SHA256 (gitlab-org-gitaly-aa388adb235751f446f3ed9ec54a46e65d8e3901_GL0.tar.gz) = c1ce691df65d130c4df83cf315c926d2e4b3970f863780f03ad2c40ce246fc16
+SIZE (gitlab-org-gitaly-aa388adb235751f446f3ed9ec54a46e65d8e3901_GL0.tar.gz) = 3459954
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 80b796de96bd..6234ac864881 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -1,8 +1,8 @@
# Created by: Torsten Zuehlsdorff <tz@FreeBSD.org>
PORTNAME= gitlab-ce
-PORTVERSION= 13.11.3
-PORTREVISION= 1
+PORTVERSION= 13.11.4
+PORTREVISION= 0
CATEGORIES= www devel
MAINTAINER= mfechner@FreeBSD.org
@@ -269,7 +269,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?= b321336e4437c4fc1693be95ec7e5319cace9510
+GL_COMMIT?= cea3c37b30e6ec5e433248fc0a5549430dcd5864
USERS= git
GROUPS= git
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index bc1eeb228aa0..f25901cc4a46 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1620332672
-SHA256 (gitlab-org-gitlab-foss-b321336e4437c4fc1693be95ec7e5319cace9510_GL0.tar.gz) = 4e4d91c2968705747b0d35513ed143c794efc780eefcc2a22cab551d97658eb0
-SIZE (gitlab-org-gitlab-foss-b321336e4437c4fc1693be95ec7e5319cace9510_GL0.tar.gz) = 96843061
+TIMESTAMP = 1621231102
+SHA256 (gitlab-org-gitlab-foss-cea3c37b30e6ec5e433248fc0a5549430dcd5864_GL0.tar.gz) = b24cea49d1b10d52aea1e9839f7d07d366a9430acb600f7356abea074c46d0b6
+SIZE (gitlab-org-gitlab-foss-cea3c37b30e6ec5e433248fc0a5549430dcd5864_GL0.tar.gz) = 96799005
diff --git a/www/gitlab-ce/pkg-plist b/www/gitlab-ce/pkg-plist
index 8dc5e621c8a5..c80ae71a5852 100644
--- a/www/gitlab-ce/pkg-plist
+++ b/www/gitlab-ce/pkg-plist
@@ -7641,6 +7641,7 @@
%%WWWDIR%%/app/presenters/ci/pipeline_artifacts/code_quality_mr_diff_presenter.rb
%%WWWDIR%%/app/presenters/ci/pipeline_presenter.rb
%%WWWDIR%%/app/presenters/ci/processable_presenter.rb
+%%WWWDIR%%/app/presenters/ci/stage_presenter.rb
%%WWWDIR%%/app/presenters/ci/trigger_presenter.rb
%%WWWDIR%%/app/presenters/ci/variable_presenter.rb
%%WWWDIR%%/app/presenters/clusterable_presenter.rb
@@ -18542,7 +18543,7 @@
%%WWWDIR%%/doc/user/profile/img/busy_indicator_sidebar_collapsed_v13_9.png
%%WWWDIR%%/doc/user/profile/img/busy_indicator_sidebar_v13_9.png
%%WWWDIR%%/doc/user/profile/img/busy_indicator_user_popovers_v13_6.png
-%%WWWDIR%%/doc/user/profile/img/notification_global_settings.png
+%%WWWDIR%%/doc/user/profile/img/notification_global_settings_v13_12.png
%%WWWDIR%%/doc/user/profile/img/notification_group_settings_v12_8.png
%%WWWDIR%%/doc/user/profile/img/notification_project_settings_v12_8.png
%%WWWDIR%%/doc/user/profile/img/profile-preferences-syntax-themes.png
@@ -32264,6 +32265,7 @@
%%WWWDIR%%/spec/presenters/ci/pipeline_artifacts/code_coverage_presenter_spec.rb
%%WWWDIR%%/spec/presenters/ci/pipeline_artifacts/code_quality_mr_diff_presenter_spec.rb
%%WWWDIR%%/spec/presenters/ci/pipeline_presenter_spec.rb
+%%WWWDIR%%/spec/presenters/ci/stage_presenter_spec.rb
%%WWWDIR%%/spec/presenters/ci/trigger_presenter_spec.rb
%%WWWDIR%%/spec/presenters/ci/variable_presenter_spec.rb
%%WWWDIR%%/spec/presenters/clusterable_presenter_spec.rb
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index cd0452534769..879e84e4f5f0 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.11.3
+PORTVERSION?= 13.11.4
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?= b321336e4437c4fc1693be95ec7e5319cace9510
+GL_COMMIT?= cea3c37b30e6ec5e433248fc0a5549430dcd5864
# for go dependencies
USE_GITHUB= nodefault
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index ee3e7282fcc9..6ad2523f672e 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1620333475
+TIMESTAMP = 1621231170
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-b321336e4437c4fc1693be95ec7e5319cace9510_GL0.tar.gz) = 4e4d91c2968705747b0d35513ed143c794efc780eefcc2a22cab551d97658eb0
-SIZE (gitlab-org-gitlab-foss-b321336e4437c4fc1693be95ec7e5319cace9510_GL0.tar.gz) = 96843061
+SHA256 (gitlab-org-gitlab-foss-cea3c37b30e6ec5e433248fc0a5549430dcd5864_GL0.tar.gz) = b24cea49d1b10d52aea1e9839f7d07d366a9430acb600f7356abea074c46d0b6
+SIZE (gitlab-org-gitlab-foss-cea3c37b30e6ec5e433248fc0a5549430dcd5864_GL0.tar.gz) = 96799005
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