diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 7d3a2b8171df..da769d018423 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitaly
-DISTVERSION=	16.9.3
+DISTVERSION=	16.10.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index cdff6f35643c..e220a414ef0f 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1711640106
-SHA256 (go/devel_gitaly/gitaly-v16.9.3/go.mod) = 1b656b9c7b58165021bff122eb0c383ecae4e15765fee1e1e872405bad2d2585
-SIZE (go/devel_gitaly/gitaly-v16.9.3/go.mod) = 10706
-SHA256 (go/devel_gitaly/gitaly-v16.9.3/gitaly-v16.9.3.tar.bz2) = 2207ab8e8eeffd349fbe5de5dcc99687381062945af9403f608011255881bdeb
-SIZE (go/devel_gitaly/gitaly-v16.9.3/gitaly-v16.9.3.tar.bz2) = 2571433
+TIMESTAMP = 1711002015
+SHA256 (go/devel_gitaly/gitaly-v16.10.0/go.mod) = 06a29b760a2af5190d105be28e7314235ca426c42a36ae5948261f39d36efc70
+SIZE (go/devel_gitaly/gitaly-v16.10.0/go.mod) = 10647
+SHA256 (go/devel_gitaly/gitaly-v16.10.0/gitaly-v16.10.0.tar.bz2) = 4f26660d1f5d4740207aec71c8c62538706f0af516d0747e8712bad9998ac1ee
+SIZE (go/devel_gitaly/gitaly-v16.10.0/gitaly-v16.10.0.tar.bz2) = 2569215
diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile
index 64c4a487f9c6..7c84718c37e0 100644
--- a/devel/gitlab-shell/Makefile
+++ b/devel/gitlab-shell/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	gitlab-shell
-PORTVERSION=	14.33.0
-PORTREVISION=	1
+PORTVERSION=	14.34.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
@@ -14,7 +13,7 @@ LICENSE=	MIT
 # https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/720
 #BUILD_DEPENDS=	heimdal>=0:security/heimdal
 
-USES=		gmake go:modules,no_targets pkgconfig
+USES=		gmake go:modules,no_targets,1.22 pkgconfig
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
diff --git a/devel/gitlab-shell/distinfo b/devel/gitlab-shell/distinfo
index d222ab3c46bc..7d3aa95813cc 100644
--- a/devel/gitlab-shell/distinfo
+++ b/devel/gitlab-shell/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1706270707
-SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.33.0/go.mod) = f64c325f61d8e8de8e172499a0a49635100f60545f20de5841612a72ed44c8ae
-SIZE (go/devel_gitlab-shell/gitlab-shell-v14.33.0/go.mod) = 4835
-SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.33.0/gitlab-shell-v14.33.0.tar.bz2) = e94a51c6cc8c4818920cf887c315e5eb26dfac1867cbcfea845277a6b6cae34f
-SIZE (go/devel_gitlab-shell/gitlab-shell-v14.33.0/gitlab-shell-v14.33.0.tar.bz2) = 143072
+TIMESTAMP = 1711002376
+SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.34.0/go.mod) = 74f67493ae38b37d290f52e5e5b15bad21dafb4aeb42fc9e8454b0a5aeaf5e81
+SIZE (go/devel_gitlab-shell/gitlab-shell-v14.34.0/go.mod) = 4979
+SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.34.0/gitlab-shell-v14.34.0.tar.bz2) = 480331530951342abb3bc6f95cc9897f9b34422cdec5f717f17c0d5822dd14df
+SIZE (go/devel_gitlab-shell/gitlab-shell-v14.34.0/gitlab-shell-v14.34.0.tar.bz2) = 146280
diff --git a/net/gitlab-agent/Makefile b/net/gitlab-agent/Makefile
index 6e472e4c4160..dce864d4f687 100644
--- a/net/gitlab-agent/Makefile
+++ b/net/gitlab-agent/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	gitlab-agent
-PORTVERSION=	16.9.2
-PORTREVISION=	1
+PORTVERSION=	16.10.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 
@@ -14,7 +13,7 @@ LICENSE=	MIT
 BUILD_DEPENDS=	git>=0:devel/git \
 		golangci-lint>=0:devel/golangci-lint
 
-USES=		go:modules,1.21
+USES=		go:modules,1.22
 GO_MODULE=	gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v16
 
 _BUILD_DATE=	$$(date -u "+%Y-%m-%d-%H%M UTC")
diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo
index 249ac393e1d6..c9305520734e 100644
--- a/net/gitlab-agent/distinfo
+++ b/net/gitlab-agent/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1707636998
-SHA256 (go/net_gitlab-agent/gitlab-agent-v16.9.2/v16.9.2.mod) = 0674d72a394a710582bac41255f290169ce52356ebd2bf2157a40e592efcb794
-SIZE (go/net_gitlab-agent/gitlab-agent-v16.9.2/v16.9.2.mod) = 8008
-SHA256 (go/net_gitlab-agent/gitlab-agent-v16.9.2/v16.9.2.zip) = 894559100cdf58c589956249ccf946ac1dfca48c958c47e187f125f13f34ab55
-SIZE (go/net_gitlab-agent/gitlab-agent-v16.9.2/v16.9.2.zip) = 1249256
+TIMESTAMP = 1711002314
+SHA256 (go/net_gitlab-agent/gitlab-agent-v16.10.1/v16.10.1.mod) = c6808de41d9040e81806e0355189a2427bc6d4d38c3e746caf790741cb136fc3
+SIZE (go/net_gitlab-agent/gitlab-agent-v16.10.1/v16.10.1.mod) = 7055
+SHA256 (go/net_gitlab-agent/gitlab-agent-v16.10.1/v16.10.1.zip) = af8434dc5df7e3d634f391b3511d9fad5948619cb099f0a044e293f2d2cdb46c
+SIZE (go/net_gitlab-agent/gitlab-agent-v16.10.1/v16.10.1.zip) = 1244996
diff --git a/textproc/gitlab-elasticsearch-indexer/Makefile b/textproc/gitlab-elasticsearch-indexer/Makefile
index ca5822a70420..d1f87da35531 100644
--- a/textproc/gitlab-elasticsearch-indexer/Makefile
+++ b/textproc/gitlab-elasticsearch-indexer/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	gitlab-elasticsearch-indexer
-PORTVERSION=	4.7.0
-PORTREVISION=	1
+PORTVERSION=	4.8.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	textproc
 
@@ -16,7 +15,7 @@ LIB_DEPENDS=	libicui18n.so:devel/icu \
 		libicuuc.so:devel/icu
 #RUN_DEPENDS=	p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool
 
-USES=		gmake go:modules,no_targets,1.21 pkgconfig
+USES=		gmake go:modules,no_targets,1.22 pkgconfig
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
diff --git a/textproc/gitlab-elasticsearch-indexer/distinfo b/textproc/gitlab-elasticsearch-indexer/distinfo
index 5d2085888b11..cf267ed635e4 100644
--- a/textproc/gitlab-elasticsearch-indexer/distinfo
+++ b/textproc/gitlab-elasticsearch-indexer/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1708413589
-SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.7.0/go.mod) = 47d7f6461dbc82e1c6f2b4f11776f8450a1654e1657161088a95468063ce315e
-SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.7.0/go.mod) = 4721
-SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.7.0/gitlab-elasticsearch-indexer-v4.7.0.tar.bz2) = 9c4ef50356aaea2acc64bcbfab3d286ffe4bf922a19d004b94b9a10977b69af5
-SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.7.0/gitlab-elasticsearch-indexer-v4.7.0.tar.bz2) = 58614
+TIMESTAMP = 1711002210
+SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.8.0/go.mod) = 7255164e57dd4e41e3ac9881bcdec559a1f5cd1efca06f8d37cf54c1355f4e49
+SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.8.0/go.mod) = 4722
+SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.8.0/gitlab-elasticsearch-indexer-v4.8.0.tar.bz2) = f6a76ae0312334610d02769035fd4edaad4f153714da45b4023bab6e55cddf10
+SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.8.0/gitlab-elasticsearch-indexer-v4.8.0.tar.bz2) = 67853
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index 6f0511b0cbf6..31e0c98f09d6 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitlab-ce
-PORTVERSION=	16.9.3
+PORTVERSION=	16.10.0
 DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	www devel
@@ -25,10 +25,10 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 # mail/rubygem-net-pop is required as ruby 3.1 removed it
 MY_DEPENDS=	git>=2.41.0:devel/git \
 	gitaly>=${PORTVERSION}:devel/gitaly \
-	gitlab-elasticsearch-indexer>=4.7.0:textproc/gitlab-elasticsearch-indexer \
-	gitlab-agent>=16.9.2:net/gitlab-agent \
+	gitlab-elasticsearch-indexer>=4.8.0:textproc/gitlab-elasticsearch-indexer \
+	gitlab-agent>=16.10.1:net/gitlab-agent \
 	gitlab-pages>=${PORTVERSION}:www/gitlab-pages \
-	gitlab-shell>=14.33.0:devel/gitlab-shell \
+	gitlab-shell>=14.34.0:devel/gitlab-shell \
 	gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \
 	redis>=6.2.11:databases/redis \
 	yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} \
@@ -37,14 +37,14 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-net-smtp>=0:mail/rubygem-net-smtp \
 	rubygem-net-pop>=0:mail/rubygem-net-pop \
 	rubygem-psych3>=3.1<4:textproc/rubygem-psych3 \
-	rubygem-rails70>=7.0.8<7.1:www/rubygem-rails70 \
+	rubygem-rails70>=7.0.8.1<7.1:www/rubygem-rails70 \
 	rubygem-bootsnap>=1.18.3<1.19:devel/rubygem-bootsnap \
 	rubygem-openssl>=3.0<4:security/rubygem-openssl \
 	rubygem-ipaddr>=1.2.5<1.3:net/rubygem-ipaddr \
 	rubygem-responders-rails70>=3.0<4.0:www/rubygem-responders-rails70 \
 	rubygem-sprockets3>=3.7<3.8:devel/rubygem-sprockets3 \
-	rubygem-view_component-rails70>=3.8.0<3.9:devel/rubygem-view_component-rails70 \
-	rubygem-pg>=1.5.4<1.6:databases/rubygem-pg \
+	rubygem-view_component-rails70>=3.11.0<3.12:devel/rubygem-view_component-rails70 \
+	rubygem-pg>=1.5.6<1.6:databases/rubygem-pg \
 	rubygem-neighbor>=0.2.3<0.3:databases/rubygem-neighbor \
 	rubygem-rugged>=1.6<2:devel/rubygem-rugged \
 	rubygem-faraday1>=1.10.0<3:www/rubygem-faraday1 \
@@ -88,10 +88,10 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-gitlab_omniauth-ldap>=2.2.0<2.3.0:net/rubygem-gitlab_omniauth-ldap \
 	rubygem-net-ldap017>=0.17.1<0.18:net/rubygem-net-ldap017 \
 	rubygem-grape>=2.0.0<2.1:devel/rubygem-grape \
-	rubygem-grape-entity>=0.10.0<0.11.0,1:devel/rubygem-grape-entity \
+	rubygem-grape-entity>=0.10.2<0.11.0,1:devel/rubygem-grape-entity \
 	rubygem-grape-swagger>=2.0.1<2.1:devel/rubygem-grape-swagger \
 	rubygem-grape-swagger-entity>=0.5.1<0.6:devel/rubygem-grape-swagger-entity \
-	rubygem-grape-path-helpers>=2.0.0<2.1:devel/rubygem-grape-path-helpers \
+	rubygem-grape-path-helpers>=2.0.1<2.1:devel/rubygem-grape-path-helpers \
 	rubygem-rack-cors>=2.0.1<2.1:www/rubygem-rack-cors \
 	rubygem-graphql>=2.2.5<2.3:devel/rubygem-graphql \
 	rubygem-graphql-docs>=4.0.0<4.1.0:devel/rubygem-graphql-docs \
@@ -129,13 +129,13 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-elasticsearch-model713>=7.2<8:textproc/rubygem-elasticsearch-model713 \
 	rubygem-elasticsearch-rails>=7.2<8:textproc/rubygem-elasticsearch-rails \
 	rubygem-elasticsearch-api713>=7.13.3<7.13.4:textproc/rubygem-elasticsearch-api713 \
-	rubygem-aws-sdk-core>=3.191.1<4:devel/rubygem-aws-sdk-core \
+	rubygem-aws-sdk-core>=3.191.3<4:devel/rubygem-aws-sdk-core \
 	rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \
-	rubygem-aws-sdk-s3>=1.143.0<2:devel/rubygem-aws-sdk-s3 \
+	rubygem-aws-sdk-s3>=1.144.0<2:devel/rubygem-aws-sdk-s3 \
 	rubygem-faraday_middleware-aws-sigv403>=0.3.0<0.4:devel/rubygem-faraday_middleware-aws-sigv403 \
 	rubygem-typhoeus>=1.4.0<1.5:www/rubygem-typhoeus \
 	rubygem-html-pipeline>=2.14.3<2.15:textproc/rubygem-html-pipeline \
-	rubygem-deckar01-task_list>=2.3.3<2.4:www/rubygem-deckar01-task_list \
+	rubygem-deckar01-task_list>=2.3.4<2.4:www/rubygem-deckar01-task_list \
 	rubygem-gitlab-markup>=1.9.0<1.10.0:textproc/rubygem-gitlab-markup \
 	rubygem-commonmarker>=0.23.10<0.24:textproc/rubygem-commonmarker \
 	rubygem-kramdown23>=2.3.1<2.4:textproc/rubygem-kramdown23 \
@@ -150,10 +150,10 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-rouge>=4.2.0<4.3:textproc/rubygem-rouge \
 	rubygem-truncato>=0.7.12<0.8.0:textproc/rubygem-truncato \
 	rubygem-nokogiri>=1.16<2:textproc/rubygem-nokogiri \
-	rubygem-gitlab-glfm-markdown>=0.0.12<0.1:textproc/rubygem-gitlab-glfm-markdown \
+	rubygem-gitlab-glfm-markdown>=0.0.13<0.1:textproc/rubygem-gitlab-glfm-markdown \
 	rubygem-icalendar>=0:devel/rubygem-icalendar \
 	rubygem-diffy>=3.4<4:textproc/rubygem-diffy \
-	rubygem-rack22>=2.2.8,3<2.3,3:www/rubygem-rack22 \
+	rubygem-rack22>=2.2.8.1,3<2.3,3:www/rubygem-rack22 \
 	rubygem-rack-timeout>=0.6.3<0.7:www/rubygem-rack-timeout \
 	rubygem-puma>=6.4<7:www/rubygem-puma \
 	rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \
@@ -166,17 +166,18 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-rainbow>=3.1.1<4.0:devel/rubygem-rainbow \
 	rubygem-ruby-progressbar>=1.11<2:devel/rubygem-ruby-progressbar \
 	rubygem-re2>=2.7.0<2.8:devel/rubygem-re2 \
-	rubygem-semver_dialects1>=1.6.1<1.7:devel/rubygem-semver_dialects1 \
+	rubygem-semver_dialects>=2.0<3:devel/rubygem-semver_dialects \
 	rubygem-version_sorter>=2.3<3:textproc/rubygem-version_sorter \
 	rubygem-js_regex>=3.8<4.0:textproc/rubygem-js_regex \
 	rubygem-device_detector>=0:devel/rubygem-device_detector \
-	rubygem-redis4>=4.8.0<4.8.2:databases/rubygem-redis4 \
 	rubygem-redis-namespace110>=1.10.0<1.11:databases/rubygem-redis-namespace110 \
+	rubygem-redis50>=5.0.0<5.1:databases/rubygem-redis50 \
+	rubygem-redis-clustering50>=5.0.0<5.1:databases/rubygem-redis-clustering50 \
 	rubygem-connection_pool>=2.4.1<3.0:net/rubygem-connection_pool \
 	rubygem-redis-actionpack-rails70>=5.4.0<5.5:databases/rubygem-redis-actionpack-rails70 \
-	rubygem-discordrb-webhooks>=3.4<4.0:net-im/rubygem-discordrb-webhooks \
-	rubygem-jira-ruby21>=2.1.4<2.2:devel/rubygem-jira-ruby21 \
-	rubygem-atlassian-jwt>=0.2.0<0.3.0:www/rubygem-atlassian-jwt \
+	rubygem-discordrb-webhooks>=3.5<4.0:net-im/rubygem-discordrb-webhooks \
+	rubygem-jira-ruby>=2.3.0<2.4:devel/rubygem-jira-ruby \
+	rubygem-atlassian-jwt>=0.2.1<0.3.0:www/rubygem-atlassian-jwt \
 	rubygem-slack-messenger>=2.3.4<2.4.0:devel/rubygem-slack-messenger \
 	rubygem-ruby-fogbugz>=0.3.0<0.4.0:devel/rubygem-ruby-fogbugz \
 	rubygem-kubeclient>=4.11.0<4.12.0:www/rubygem-kubeclient \
@@ -192,9 +193,7 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-gitlab-chronic>=0.10.5<0.11.0:devel/rubygem-gitlab-chronic \
 	rubygem-gitlab_chronic_duration>=0.12<1:devel/rubygem-gitlab_chronic_duration \
 	rubygem-rack-proxy>=0.7.7<0.8.0:www/rubygem-rack-proxy \
-	rubygem-sassc-rails-rails70>=2.1.0<2.2.0:textproc/rubygem-sassc-rails-rails70 \
-	rubygem-cssbundling-rails13-rails70>=1.3.3<1.3.4:www/rubygem-cssbundling-rails13-rails70 \
-	rubygem-autoprefixer-rails1025>=10.2.5.1<10.2.6:textproc/rubygem-autoprefixer-rails1025 \
+	rubygem-cssbundling-rails-rails70>=1.4.0<1.5:www/rubygem-cssbundling-rails-rails70 \
 	rubygem-terser>=1.0.2<1.0.3:textproc/rubygem-terser \
 	rubygem-addressable>=2.8<3:www/rubygem-addressable \
 	rubygem-tanuki_emoji>=0.9<1:graphics/rubygem-tanuki_emoji \
@@ -213,14 +212,14 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-thrift>=0.16.0:devel/rubygem-thrift \
 	rubygem-rails-i18n-rails70>=7.0<8:devel/rubygem-rails-i18n-rails70 \
 	rubygem-gettext_i18n_rails111>=1.11.0<1.12.0:devel/rubygem-gettext_i18n_rails111 \
-	rubygem-gettext>=3.3<4:devel/rubygem-gettext \
+	rubygem-gettext>=3.4<4:devel/rubygem-gettext \
 	rubygem-batch-loader>=2.0.1<2.1:devel/rubygem-batch-loader \
 	rubygem-peek-rails70>=1.1<2.0:devel/rubygem-peek-rails70 \
 	rubygem-snowplow-tracker>=0.8.0<1:devel/rubygem-snowplow-tracker \
 	rubygem-webrick>=1.8.1<1.9:www/rubygem-webrick \
 	rubygem-prometheus-client-mmap>=1.1.1<2:devel/rubygem-prometheus-client-mmap \
 	rubygem-warning>=1.3.0<1.4:devel/rubygem-warning \
-	rubygem-gitlab-dangerfiles>=4.6.0<4.7:devel/rubygem-gitlab-dangerfiles \
+	rubygem-gitlab-dangerfiles>=4.7.0<4.8:devel/rubygem-gitlab-dangerfiles \
 	rubygem-license_finder>=7.0.0<8:devel/rubygem-license_finder \
 	rubygem-rspec>=3.0<4:devel/rubygem-rspec \
 	rubygem-octokit>=8.0<9:net/rubygem-octokit \
@@ -238,10 +237,10 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-net-ntp>0:net/rubygem-net-ntp \
 	rubygem-ssh_data>=1.3<2:security/rubygem-ssh_data \
 	rubygem-spamcheck>=1.3.0<1.4:net/rubygem-spamcheck \
-	rubygem-gitaly>=16.9.0.rc3<16.10.0:net/rubygem-gitaly \
+	rubygem-gitaly>=16.10.0.pre.rc1<16.11.0:net/rubygem-gitaly \
 	rubygem-kas-grpc>=0.4.0,1<0.5.0,1:net/rubygem-kas-grpc \
 	rubygem-grpc>=1.60.0<2:net/rubygem-grpc \
-	rubygem-google-protobuf>=3.25.1<4:devel/rubygem-google-protobuf \
+	rubygem-google-protobuf>=3.25.3<4:devel/rubygem-google-protobuf \
 	rubygem-toml-rb>=2.2.0<3:www/rubygem-toml-rb \
 	rubygem-flipper026>=0.26.2<0.27:devel/rubygem-flipper026 \
 	rubygem-flipper-active_record-rails70>=0.26.2<0.27:databases/rubygem-flipper-active_record-rails70 \
@@ -249,7 +248,7 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-unleash>=3.2.2<3.3:devel/rubygem-unleash \
 	rubygem-gitlab-experiment>=0.9.1<0.10:devel/rubygem-gitlab-experiment \
 	rubygem-lograge-rails70>=0.11.2<1.0:www/rubygem-lograge-rails70 \
-	rubygem-grape_logging>=1.8<2.0:devel/rubygem-grape_logging \
+	rubygem-grape_logging>=1.8.4<2.0:devel/rubygem-grape_logging \
 	rubygem-gitlab-net-dns>=0.9.2<0.10:dns/rubygem-gitlab-net-dns \
 	rubygem-countries>=4.1.3<4.2.0:devel/rubygem-countries \
 	rubygem-retriable>=3.1.2<3.2.0:devel/rubygem-retriable \
@@ -319,7 +318,6 @@ SHEBANG_FILES=	scripts/build_qa_image \
 		scripts/db_tasks \
 		scripts/rails-update-bisect \
 		scripts/generate-e2e-pipeline \
-		scripts/frontend/compare_css_compilers.sh \
 		scripts/frontend/execute-on-staged-files.sh \
 		scripts/frontend/start_storybook.sh \
 		scripts/partitioning/generate-fk \
@@ -360,6 +358,7 @@ do-install:
 	${MV} ${WRKSRC}/lib/support/nginx/gitlab ${WRKSRC}/lib/support/nginx/gitlab.sample
 	${MV} ${WRKSRC}/lib/support/nginx/gitlab-ssl ${WRKSRC}/lib/support/nginx/gitlab-ssl.sample
 	${MV} ${WRKSRC}/public/robots.txt ${WRKSRC}/public/robots.txt.sample
+	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/app/assets/builds
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/assets
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/uploads
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/cache
@@ -385,6 +384,7 @@ post-install:
 	@${ECHO_CMD} "@owner git" >> ${TMPPLIST}
 	@${ECHO_CMD} "@group www" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(git,git) ${WWWDIR_REL}/" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/builds/" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/images/auth_buttons/" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/javascripts/locale/" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/javascripts/pipeline_wizard/templates/" >> ${TMPPLIST}
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index 9ca9199a42f7..dd24a5fe7752 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711640015
-SHA256 (gitlab-foss-v16.9.3.tar.bz2) = 4be0fab6d62c0980ad38ba9e2df146f66413f5b32c6b224ac8a9d80c548bf5af
-SIZE (gitlab-foss-v16.9.3.tar.bz2) = 101536442
+TIMESTAMP = 1711012899
+SHA256 (gitlab-foss-v16.10.0.tar.bz2) = 42895a3f2b0e9ab437da4f7bf8589b9f678fff886a138cdc306f4cd60544a8d7
+SIZE (gitlab-foss-v16.10.0.tar.bz2) = 101867224
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index cbed2bd0fde2..74417b44eeea 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig	2024-02-14 14:42:02 UTC
+--- Gemfile.orig	2024-03-20 12:36:02 UTC
 +++ Gemfile
 @@ -58,7 +58,7 @@ gem 'neighbor', '~> 0.2.3' # rubocop:todo Gemfile/Miss
  
@@ -51,15 +51,15 @@
  gem 'elasticsearch-model', '~> 7.2' # rubocop:todo Gemfile/MissingFeatureCategory
  gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' # rubocop:todo Gemfile/MissingFeatureCategory
  gem 'elasticsearch-api',   '7.13.3' # rubocop:todo Gemfile/MissingFeatureCategory
--gem 'aws-sdk-core', '~> 3.191.1' # rubocop:todo Gemfile/MissingFeatureCategory
+-gem 'aws-sdk-core', '~> 3.191.3' # rubocop:todo Gemfile/MissingFeatureCategory
 +gem 'aws-sdk-core', '~> 3.191' # rubocop:todo Gemfile/MissingFeatureCategory
  gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory
--gem 'aws-sdk-s3', '~> 1.143.0' # rubocop:todo Gemfile/MissingFeatureCategory
-+gem 'aws-sdk-s3', '~> 1.143' # rubocop:todo Gemfile/MissingFeatureCategory
+-gem 'aws-sdk-s3', '~> 1.144.0' # rubocop:todo Gemfile/MissingFeatureCategory
++gem 'aws-sdk-s3', '~> 1.144' # rubocop:todo Gemfile/MissingFeatureCategory
  gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
  gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # rubocop:todo Gemfile/MissingFeatureCategory
  
-@@ -245,7 +245,7 @@ gem 'rack', '~> 2.2.8' # rubocop:todo Gemfile/MissingF
+@@ -245,7 +245,7 @@ gem 'rack', '~> 2.2.8.1' # rubocop:todo Gemfile/Missin
  gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base' # rubocop:todo Gemfile/MissingFeatureCategory
  
  group :puma do
@@ -77,7 +77,7 @@
  gem 'sidekiq-cron', '~> 1.12.0', feature_category: :shared
  gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', require: 'sidekiq-reliable-fetch' # rubocop:todo Gemfile/MissingFeatureCategory
  
-@@ -397,93 +397,10 @@ gem 'prometheus-client-mmap', '~> 1.1', '>= 1.1.1', re
+@@ -399,93 +399,10 @@ gem 'prometheus-client-mmap', '~> 1.1', '>= 1.1.1', re
  
  gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
  
@@ -96,11 +96,11 @@
 -
 -  gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory
 -
--  gem 'ruby-lsp', "~> 0.13.3", require: false, feature_category: :tooling
+-  gem 'ruby-lsp', "~> 0.14.4", require: false, feature_category: :tooling
 -
--  gem 'ruby-lsp-rails', "~> 0.2.8", feature_category: :tooling
+-  gem 'ruby-lsp-rails', "~> 0.3.0", feature_category: :tooling
 -
--  gem 'ruby-lsp-rspec', "~> 0.1.8", require: false, feature_category: :tooling
+-  gem 'ruby-lsp-rspec', "~> 0.1.10", require: false, feature_category: :tooling
 -end
 -
 -group :development, :test do
@@ -115,7 +115,7 @@
 -
 -  gem 'database_cleaner-active_record', '~> 2.1.0', feature_category: :database
 -  gem 'factory_bot_rails', '~> 6.4.3' # rubocop:todo Gemfile/MissingFeatureCategory
--  gem 'rspec-rails', '~> 6.1.0', feature_category: :shared
+-  gem 'rspec-rails', '~> 6.1.1', feature_category: :shared
 -
 -  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
 -  gem 'minitest', '~> 5.11.0' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -135,7 +135,7 @@
 -  # Profiling data from CI/CD pipelines
 -  gem 'influxdb-client', '~> 2.9', require: false # rubocop:todo Gemfile/MissingFeatureCategory
 -
--  gem 'knapsack', '~> 1.21.1', feature_category: :tooling
+-  gem 'knapsack', '~> 1.22.0', feature_category: :tooling
 -  gem 'crystalball', '~> 0.7.0', require: false, feature_category: :tooling
 -  gem 'test_file_finder', '~> 0.2.1', feature_category: :tooling
 -
@@ -158,7 +158,7 @@
 -end
 -
  group :development, :test, :danger do
-   gem 'gitlab-dangerfiles', '~> 4.6.0', require: false, feature_category: :tooling
+   gem 'gitlab-dangerfiles', '~> 4.7.0', require: false, feature_category: :tooling
  end
  
 -group :development, :test, :coverage do
@@ -171,59 +171,53 @@
  # Gems required in omnibus-gitlab pipeline
  group :development, :test, :omnibus do
    gem 'license_finder', '~> 7.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-@@ -495,36 +412,6 @@ group :development, :test, :monorepo do
+@@ -497,36 +414,6 @@ group :development, :test, :monorepo do
    gem 'gitlab-rspec_flaky', path: 'gems/gitlab-rspec_flaky', feature_category: :tooling
  end
  
 -group :test do
 -  gem 'fuubar', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
 -  gem 'rspec-retry', '~> 0.6.2', feature_category: :tooling
--  gem 'rspec_profiling', '~> 0.0.6', feature_category: :tooling
+-  gem 'rspec_profiling', '~> 0.0.8', feature_category: :tooling
 -  gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling
 -  gem 'rspec-parameterized', '~> 1.0', require: false, feature_category: :tooling
--  gem 'os', '~> 1.1', feature_category: :tooling
+-  gem 'os', '~> 1.1', '>= 1.1.4', feature_category: :tooling
 -
 -  gem 'capybara', '~> 3.40' # rubocop:todo Gemfile/MissingFeatureCategory
 -  gem 'capybara-screenshot', '~> 1.0.26' # rubocop:todo Gemfile/MissingFeatureCategory
--  gem 'selenium-webdriver', '~> 4.17' # rubocop:todo Gemfile/MissingFeatureCategory
+-  gem 'selenium-webdriver', '~> 4.18', '>= 4.18.1' # rubocop:todo Gemfile/MissingFeatureCategory
 -
 -  gem 'graphlyte', '~> 1.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
 -
 -  gem 'shoulda-matchers', '~> 5.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
 -  gem 'email_spec', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
--  gem 'webmock', '~> 3.20.0' # rubocop:todo Gemfile/MissingFeatureCategory
+-  gem 'webmock', '~> 3.22.0' # rubocop:todo Gemfile/MissingFeatureCategory
 -  gem 'rails-controller-testing' # rubocop:todo Gemfile/MissingFeatureCategory
 -  gem 'concurrent-ruby', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory
 -  gem 'test-prof', '~> 1.3.1' # rubocop:todo Gemfile/MissingFeatureCategory
 -  gem 'rspec_junit_formatter' # rubocop:todo Gemfile/MissingFeatureCategory
 -  gem 'guard-rspec' # rubocop:todo Gemfile/MissingFeatureCategory
--  gem 'axe-core-rspec', '~> 4.8.0', feature_category: :tooling
+-  gem 'axe-core-rspec', '~> 4.8.2', feature_category: :tooling
 -
 -  # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
 -  gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory
 -
--  gem 'gitlab_quality-test_tooling', '~> 1.14.2', require: false, feature_category: :tooling
+-  gem 'gitlab_quality-test_tooling', '~> 1.17.0', require: false, feature_category: :tooling
 -end
 -
  gem 'octokit', '~> 8.0', feature_category: :importers
  
  gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared
-@@ -557,12 +444,12 @@ gem 'ssh_data', '~> 1.3' # rubocop:todo Gemfile/Missin
- gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
- 
- # Gitaly GRPC protocol definitions
--gem 'gitaly', '~> 16.9.0-rc3', feature_category: :gitaly
-+gem 'gitaly', '~> 16.9', feature_category: :gitaly
- 
+@@ -564,7 +451,7 @@ gem 'gitaly', '~> 16.10.0-rc1', feature_category: :git
  # KAS GRPC protocol definitions
  gem 'kas-grpc', '~> 0.4.0', feature_category: :deployment_management
  
 -gem 'grpc', '~> 1.60.0' # rubocop:todo Gemfile/MissingFeatureCategory
 +gem 'grpc', '~> 1.60' # rubocop:todo Gemfile/MissingFeatureCategory
  
- gem 'google-protobuf', '~> 3.25', '>= 3.25.1' # rubocop:todo Gemfile/MissingFeatureCategory
+ gem 'google-protobuf', '~> 3.25', '>= 3.25.3' # rubocop:todo Gemfile/MissingFeatureCategory
  
-@@ -583,7 +470,7 @@ gem 'grape_logging', '~> 1.8', feature_category: :api
+@@ -585,7 +472,7 @@ gem 'grape_logging', '~> 1.8', '>= 1.8.4', feature_cat
  gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfile/MissingFeatureCategory
  
  # Countries list
@@ -232,7 +226,7 @@
  
  gem 'retriable', '~> 3.1.2' # rubocop:todo Gemfile/MissingFeatureCategory
  
-@@ -649,6 +536,7 @@ gem 'app_store_connect' # rubocop:todo Gemfile/Missing
+@@ -651,6 +538,7 @@ gem 'app_store_connect' # rubocop:todo Gemfile/Missing
  gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemfile/MissingFeatureCategory
  
  # BufferedIO patch
@@ -240,7 +234,7 @@
  # Updating this version will require updating scripts/allowed_warnings.txt
  gem 'net-protocol', '~> 0.1.3' # rubocop:todo Gemfile/MissingFeatureCategory
  # Lock this until we make DNS rebinding work with the updated net-http:
-@@ -656,5 +544,11 @@ gem 'net-protocol', '~> 0.1.3' # rubocop:todo Gemfile/
+@@ -658,5 +546,11 @@ gem 'net-protocol', '~> 0.1.3' # rubocop:todo Gemfile/
  gem 'net-http', '= 0.1.1' # rubocop:todo Gemfile/MissingFeatureCategory
  
  gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory
diff --git a/www/gitlab-ce/files/patch-lib_gitlab_patch_redis__cluster.rb b/www/gitlab-ce/files/patch-lib_gitlab_patch_redis__cluster.rb
deleted file mode 100644
index 5e28885407b6..000000000000
--- a/www/gitlab-ce/files/patch-lib_gitlab_patch_redis__cluster.rb
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/gitlab/patch/redis_cluster.rb.orig	2023-07-06 07:35:20 UTC
-+++ lib/gitlab/patch/redis_cluster.rb
-@@ -4,7 +4,7 @@
- # In redis v5.0.x, cross-slot pipelining is implemented via redis-cluster-client.
- # This patch should be removed since there is no need for it.
- # Gitlab::Redis::CrossSlot and its usage should be removed as well.
--if Gem::Version.new(Redis::VERSION) != Gem::Version.new('4.8.0')
-+if Gem::Version.new(Redis::VERSION) != Gem::Version.new('4.8.1')
-   raise 'New version of redis detected, please remove or update this patch'
- end
- 
diff --git a/www/gitlab-ce/pkg-message b/www/gitlab-ce/pkg-message
index 506c59f2db32..5e98f2054fa2 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/16.9-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/16.10-freebsd.md
 EOM
   type: install
 }
@@ -20,7 +20,7 @@ EOM
 If you just installed an major upgrade of GitLab, for example you
 switched from 14.5.x to 14.6.x, please follow the instructions in the guide at:
 
-https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/16.8-16.9-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/16.9-16.10-freebsd.md
 
 If you just installed an minor upgrade of GitLab please follow
 the instructions in the guide at:
diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile
index 2fc43470872b..5fa0ef9d8be3 100644
--- a/www/gitlab-pages/Makefile
+++ b/www/gitlab-pages/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitlab-pages
-PORTVERSION=	16.9.3
+PORTVERSION=	16.10.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 MASTER_SITES+=	https://gitlab.com/gitlab-org/gitlab-pages/-/raw/v${DISTVERSION}/
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index c51282d6bf9b..e75013ce4b0d 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1711640060
-SHA256 (go/www_gitlab-pages/gitlab-pages-v16.9.3/go.mod) = 70b1630e6a33beb18e349e7b8dcf035610c5e515842c9a5ddf881868af3f9e7b
-SIZE (go/www_gitlab-pages/gitlab-pages-v16.9.3/go.mod) = 3295
-SHA256 (go/www_gitlab-pages/gitlab-pages-v16.9.3/gitlab-pages-v16.9.3.tar.bz2) = 646836345c831917fea8f7f2088caa384c16a5853e53c1361567ec5413aad414
-SIZE (go/www_gitlab-pages/gitlab-pages-v16.9.3/gitlab-pages-v16.9.3.tar.bz2) = 212154
+TIMESTAMP = 1711001725
+SHA256 (go/www_gitlab-pages/gitlab-pages-v16.10.0/go.mod) = de0926d06d56e5cdb84c2c4fd4bc05bb9c8c3724a8e1cf8c0f775856958540ba
+SIZE (go/www_gitlab-pages/gitlab-pages-v16.10.0/go.mod) = 3328
+SHA256 (go/www_gitlab-pages/gitlab-pages-v16.10.0/gitlab-pages-v16.10.0.tar.bz2) = e9556e69ef6e903680b41d9404dee5b1509944308d981ccb85ef1398a500d808
+SIZE (go/www_gitlab-pages/gitlab-pages-v16.10.0/gitlab-pages-v16.10.0.tar.bz2) = 212938
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index 396b1284295c..c9cef356b3cc 100644
--- a/www/gitlab-workhorse/Makefile
+++ b/www/gitlab-workhorse/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitlab-workhorse
-PORTVERSION=	16.9.3
+PORTVERSION=	16.10.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index db3c77cce395..77280f3ec0f9 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1711640119
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.9.3/go.mod) = 87061b1970210fe7f343802ce591af704fd46a0c5f51370783a692cc892372ec
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.9.3/go.mod) = 6614
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.9.3/gitlab-foss-v16.9.3.tar.bz2) = 4be0fab6d62c0980ad38ba9e2df146f66413f5b32c6b224ac8a9d80c548bf5af
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.9.3/gitlab-foss-v16.9.3.tar.bz2) = 101536442
+TIMESTAMP = 1711001802
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.10.0/go.mod) = 30331c370381660ab69d81ef95e68b1d1618fe3c25758b3e6dc11f355a1d870c
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.10.0/go.mod) = 7081
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.10.0/gitlab-foss-v16.10.0.tar.bz2) = 42895a3f2b0e9ab437da4f7bf8589b9f678fff886a138cdc306f4cd60544a8d7
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.10.0/gitlab-foss-v16.10.0.tar.bz2) = 101867224