diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index ac355ce4c2efc..2e7f6bd347a9d 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitaly
-DISTVERSION=	16.5.1
+DISTVERSION=	16.6.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 9ad68b5338af5..ae44ac8bed194 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1698824662
-SHA256 (go/devel_gitaly/gitaly-v16.5.1/go.mod) = c228a15141524a153c43ebc1b79a26cbe18baaf6e7966f5ca718557047a3bf18
-SIZE (go/devel_gitaly/gitaly-v16.5.1/go.mod) = 10529
-SHA256 (go/devel_gitaly/gitaly-v16.5.1/gitaly-v16.5.1.tar.bz2) = 9b0363908e76414ca95e193505b4c503b366d8adbd29b7eb5bb7be52a03f9430
-SIZE (go/devel_gitaly/gitaly-v16.5.1/gitaly-v16.5.1.tar.bz2) = 2484724
+TIMESTAMP = 1700424537
+SHA256 (go/devel_gitaly/gitaly-v16.6.0/go.mod) = 116d784159802d477662fb34b1165c4f02fd8caf8ac72718b2c518745dc0ebc3
+SIZE (go/devel_gitaly/gitaly-v16.6.0/go.mod) = 10585
+SHA256 (go/devel_gitaly/gitaly-v16.6.0/gitaly-v16.6.0.tar.bz2) = 27d8162e1e5e70297c9d2d549335ccf4f12d23ae192478f4a82a84ae764f37ab
+SIZE (go/devel_gitaly/gitaly-v16.6.0/gitaly-v16.6.0.tar.bz2) = 2507302
diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile
index 94580cafea0c4..5067ff74c8bba 100644
--- a/devel/gitlab-shell/Makefile
+++ b/devel/gitlab-shell/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitlab-shell
-PORTVERSION=	14.29.0
+PORTVERSION=	14.30.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
@@ -14,7 +14,6 @@ LICENSE=	MIT
 #BUILD_DEPENDS=	heimdal>=0:security/heimdal
 
 USES=		gmake go:modules,no_targets pkgconfig
-CGO_ENABLED=	0
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
diff --git a/devel/gitlab-shell/distinfo b/devel/gitlab-shell/distinfo
index b8875fe9eb34c..ab448dc49fc35 100644
--- a/devel/gitlab-shell/distinfo
+++ b/devel/gitlab-shell/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1698070113
-SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.29.0/go.mod) = b9545469fc1ff91969adbb05cc7cc19976d63f8ae097f857bcdabd824c804412
-SIZE (go/devel_gitlab-shell/gitlab-shell-v14.29.0/go.mod) = 4839
-SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.29.0/gitlab-shell-v14.29.0.tar.bz2) = ee3edbc89fa0d8314afad7fc3e208390f4aca02ab96487118b42f2fca2d63326
-SIZE (go/devel_gitlab-shell/gitlab-shell-v14.29.0/gitlab-shell-v14.29.0.tar.bz2) = 140791
+TIMESTAMP = 1700424728
+SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.30.1/go.mod) = 320101ce7d39bd11a91c2620f8dcdf839efea305912464e30b5b85622ddf321a
+SIZE (go/devel_gitlab-shell/gitlab-shell-v14.30.1/go.mod) = 4794
+SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.30.1/gitlab-shell-v14.30.1.tar.bz2) = adc1672f01c67f53570b13cb247fa6b529702d10f8f77929a46bd879de527da2
+SIZE (go/devel_gitlab-shell/gitlab-shell-v14.30.1/gitlab-shell-v14.30.1.tar.bz2) = 141067
diff --git a/devel/gitlab-shell/files/patch-Makefile b/devel/gitlab-shell/files/patch-Makefile
new file mode 100644
index 0000000000000..9a7419bc1dda8
--- /dev/null
+++ b/devel/gitlab-shell/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.orig	2023-11-20 05:28:27 UTC
++++ Makefile
+@@ -5,7 +5,7 @@ OS := $(shell uname | tr A-Z a-z)
+ GO_SOURCES := $(shell git ls-files \*.go)
+ VERSION_STRING := $(shell git describe --match v* 2>/dev/null || awk '$$0="v"$$0' VERSION 2>/dev/null || echo unknown)
+ BUILD_TIME := $(shell date -u +%Y%m%d.%H%M%S)
+-BUILD_TAGS := tracer_static tracer_static_jaeger continuous_profiler_stackdriver gssapi
++BUILD_TAGS := tracer_static tracer_static_jaeger continuous_profiler_stackdriver
+ 
+ ARCH ?= $(shell uname -m | sed -e 's/x86_64/amd64/' | sed -e 's/aarch64/arm64/')
+ 
diff --git a/net/gitlab-agent/Makefile b/net/gitlab-agent/Makefile
index 0840f34c15172..a08c6fcad5620 100644
--- a/net/gitlab-agent/Makefile
+++ b/net/gitlab-agent/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitlab-agent
-PORTVERSION=	16.5.0
+PORTVERSION=	16.6.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 
diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo
index e392e437a7283..27846173c1d11 100644
--- a/net/gitlab-agent/distinfo
+++ b/net/gitlab-agent/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1698070557
-SHA256 (go/net_gitlab-agent/gitlab-agent-v16.5.0/v16.5.0.mod) = e7909ae4949d26fb6600859c36e27a98dc977f804963d10e81424f5b116e3a35
-SIZE (go/net_gitlab-agent/gitlab-agent-v16.5.0/v16.5.0.mod) = 7177
-SHA256 (go/net_gitlab-agent/gitlab-agent-v16.5.0/v16.5.0.zip) = 2aeafd1ec137810eb6cd86e77e183acadff3ea40fe69985f97fd5a40f02f37f6
-SIZE (go/net_gitlab-agent/gitlab-agent-v16.5.0/v16.5.0.zip) = 1223840
+TIMESTAMP = 1700804081
+SHA256 (go/net_gitlab-agent/gitlab-agent-v16.6.0/v16.6.0.mod) = f7f7efc08862476eaeb68ac06ba386ab31ce9059c8ba4c6cf1ed65267cd048a8
+SIZE (go/net_gitlab-agent/gitlab-agent-v16.6.0/v16.6.0.mod) = 7214
+SHA256 (go/net_gitlab-agent/gitlab-agent-v16.6.0/v16.6.0.zip) = 76738c88c8bef326a78946069cb5dbdfeab50a40c0b6589bedd5c06002542047
+SIZE (go/net_gitlab-agent/gitlab-agent-v16.6.0/v16.6.0.zip) = 1229156
diff --git a/textproc/gitlab-elasticsearch-indexer/Makefile b/textproc/gitlab-elasticsearch-indexer/Makefile
index 833c2470f4494..52d5f10914d34 100644
--- a/textproc/gitlab-elasticsearch-indexer/Makefile
+++ b/textproc/gitlab-elasticsearch-indexer/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	gitlab-elasticsearch-indexer
-PORTVERSION=	4.4.0
+PORTVERSION=	4.5.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	textproc
 
 MAINTAINER=	mfechner@FreeBSD.org
diff --git a/textproc/gitlab-elasticsearch-indexer/distinfo b/textproc/gitlab-elasticsearch-indexer/distinfo
index b5a8732a0543a..c84e88220d00b 100644
--- a/textproc/gitlab-elasticsearch-indexer/distinfo
+++ b/textproc/gitlab-elasticsearch-indexer/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1698070591
-SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.4.0/go.mod) = 3c01eb1e7df33e086f3c422f277e06374ec55ff4b9bf006fc10586eb86d186f6
-SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.4.0/go.mod) = 4669
-SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.4.0/gitlab-elasticsearch-indexer-v4.4.0.tar.bz2) = 8d182bdb3c103325c952af0a941fdab1fa1db2ffc00c8458dc9ea3b75a5edc25
-SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.4.0/gitlab-elasticsearch-indexer-v4.4.0.tar.bz2) = 58801
+TIMESTAMP = 1700763661
+SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.5.0/go.mod) = 1b4e18ed56e2774615bf8c5bdbf2133be0366917d4907fbc7e27b3f82b8f0ba1
+SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.5.0/go.mod) = 4653
+SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.5.0/gitlab-elasticsearch-indexer-v4.5.0.tar.bz2) = 6e48387f8118bdee6d6c7b0bc856f5d02e8890a4f557373b377ac5fcd778aea0
+SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.5.0/gitlab-elasticsearch-indexer-v4.5.0.tar.bz2) = 59249
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index 2ed26d893ebbf..44772c6c15bdf 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	gitlab-ce
-PORTVERSION=	16.5.1
+PORTVERSION=	16.6.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
 CATEGORIES=	www devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -20,10 +19,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.4.0:textproc/gitlab-elasticsearch-indexer \
-	gitlab-agent>=16.5.0:net/gitlab-agent \
+	gitlab-elasticsearch-indexer>=4.5.0:textproc/gitlab-elasticsearch-indexer \
+	gitlab-agent>=16.6.0:net/gitlab-agent \
 	gitlab-pages>=${PORTVERSION}:www/gitlab-pages \
-	gitlab-shell>=14.29.0:devel/gitlab-shell \
+	gitlab-shell>=14.30.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} \
@@ -34,19 +33,19 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-psych3>=3.1<4:textproc/rubygem-psych3 \
 	rubygem-rails70>=7.0.8<7.1:www/rubygem-rails70 \
 	rubygem-vite_rails-rails70>=0:devel/rubygem-vite_rails-rails70 \
-	rubygem-bootsnap116>=1.16.0<1.17:devel/rubygem-bootsnap116 \
+	rubygem-bootsnap>=1.17.0<1.18: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.6.0<3.7:devel/rubygem-view_component-rails70 \
+	rubygem-view_component-rails70>=3.7.0<3.8:devel/rubygem-view_component-rails70 \
 	rubygem-pg>=1.5.4<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 \
 	rubygem-marginalia>=1.11.1<1.12:databases/rubygem-marginalia \
 	rubygem-declarative_policy>=1.1.0<1.2:security/rubygem-declarative_policy \
-	rubygem-devise48-rails70>=4.8.1<4.9:devel/rubygem-devise48-rails70 \
+	rubygem-devise-rails70>=4.9.3<4.10:devel/rubygem-devise-rails70 \
 	rubygem-bcrypt>=3.1.14<3.2:security/rubygem-bcrypt \
 	rubygem-doorkeeper-rails70>=5.6.6<6:security/rubygem-doorkeeper-rails70 \
 	rubygem-doorkeeper-openid_connect>=1.8.7<2:security/rubygem-doorkeeper-openid_connect \
@@ -79,7 +78,7 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-rubyzip>=2.3.2<2.4:archivers/rubygem-rubyzip \
 	rubygem-acme-client>=2.0.9<3:security/rubygem-acme-client \
 	rubygem-browser>=5.3.1<5.4:www/rubygem-browser \
-	rubygem-ohai17>=17.9<18:sysutils/rubygem-ohai17 \
+	rubygem-ohai>=18.1<19:sysutils/rubygem-ohai \
 	rubygem-gpgme>=2.0.23<2.1.0:security/rubygem-gpgme \
 	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 \
@@ -92,7 +91,7 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-graphql>=2.0.27<2.1:devel/rubygem-graphql \
 	rubygem-graphql-docs>=4.0.0<4.1.0:devel/rubygem-graphql-docs \
 	rubygem-graphiql-rails>=1.8.0<1.9:devel/rubygem-graphiql-rails \
-	rubygem-apollo_upload_server>=2.1.0<2.2:net/rubygem-apollo_upload_server \
+	rubygem-apollo_upload_server>=2.1.5<2.2:net/rubygem-apollo_upload_server \
 	rubygem-graphlient>=0.5.0<0.6:devel/rubygem-graphlient \
 	rubygem-ffaker>=2.10<3:devel/rubygem-ffaker \
 	rubygem-hashie>=5.0.0<5.1:devel/rubygem-hashie \
@@ -121,7 +120,7 @@ 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.185.1<4:devel/rubygem-aws-sdk-core \
+	rubygem-aws-sdk-core>=3.186.0<4:devel/rubygem-aws-sdk-core \
 	rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \
 	rubygem-aws-sdk-s3>=1.136.0<2:devel/rubygem-aws-sdk-s3 \
 	rubygem-faraday_middleware-aws-sigv403>=0.3.0<0.4:devel/rubygem-faraday_middleware-aws-sigv403 \
@@ -131,7 +130,7 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	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 \
-	rubygem-redcloth>=4.3.2<4.4.0:www/rubygem-redcloth \
+	rubygem-redcloth>=4.3.3<4.4.0:www/rubygem-redcloth \
 	rubygem-org-ruby>=0.9.12<0.10.0:textproc/rubygem-org-ruby \
 	rubygem-creole>=0.5.0<0.6.0:textproc/rubygem-creole \
 	rubygem-wikicloth081>=0.8.1<0.8.2:textproc/rubygem-wikicloth081 \
@@ -139,7 +138,7 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-asciidoctor-include-ext>=0.4.0<0.5.0:textproc/rubygem-asciidoctor-include-ext \
 	rubygem-asciidoctor-plantuml00>=0.0.16<0.1:textproc/rubygem-asciidoctor-plantuml00 \
 	rubygem-asciidoctor-kroki>=0.8.0<0.9:textproc/rubygem-asciidoctor-kroki \
-	rubygem-rouge41>=4.1.3<4.2:textproc/rubygem-rouge41 \
+	rubygem-rouge>=4.2.0<4.3:textproc/rubygem-rouge \
 	rubygem-truncato>=0.7.12<0.8.0:textproc/rubygem-truncato \
 	rubygem-nokogiri>=1.15.4<2:textproc/rubygem-nokogiri \
 	rubygem-icalendar>=0:devel/rubygem-icalendar \
@@ -150,16 +149,15 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-puma>=6.4<7:www/rubygem-puma \
 	rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \
 	rubygem-state_machines-activerecord08>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord08 \
-	rubygem-acts-as-taggable-on>=9.0<10:www/rubygem-acts-as-taggable-on \
-	rubygem-sidekiq6>=6.5.7<6.6:devel/rubygem-sidekiq6 \
+	rubygem-acts-as-taggable-on>=10.0<11:www/rubygem-acts-as-taggable-on \
+	rubygem-sidekiq6>=6.5.10<6.6:devel/rubygem-sidekiq6 \
 	rubygem-sidekiq-cron18>=1.8.0<1.9:devel/rubygem-sidekiq-cron18 \
-	rubygem-redis-namespace19>=1.9.0<1.10.0:databases/rubygem-redis-namespace19 \
 	rubygem-fugit18>=1.8.1<1.9:devel/rubygem-fugit18 \
 	rubygem-httparty>=0.21.0<0.22:www/rubygem-httparty \
 	rubygem-rainbow>=3.1.1<4.0:devel/rubygem-rainbow \
 	rubygem-ruby-progressbar>=1.11<2:devel/rubygem-ruby-progressbar \
-	rubygem-re2>=2.1.3<2.2:devel/rubygem-re2 \
-	rubygem-semver_dialects12>=1.2.1<1.3:devel/rubygem-semver_dialects12 \
+	rubygem-re2>=2.3.0<2.4:devel/rubygem-re2 \
+	rubygem-semver_dialects>=1.5<2: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 \
@@ -188,7 +186,7 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-autoprefixer-rails1025>=10.2.5.1<10.2.6:textproc/rubygem-autoprefixer-rails1025 \
 	rubygem-terser>=1.0.2:textproc/rubygem-terser \
 	rubygem-addressable>=2.8<3:www/rubygem-addressable \
-	rubygem-tanuki_emoji>=0.7<1:graphics/rubygem-tanuki_emoji \
+	rubygem-tanuki_emoji>=0.9<1:graphics/rubygem-tanuki_emoji \
 	rubygem-gon-rails70>=6.4.0<6.5:www/rubygem-gon-rails70 \
 	rubygem-request_store>=1.5.1<2.0:devel/rubygem-request_store \
 	rubygem-base32>=0.3.0<0.4.0:converters/rubygem-base32 \
@@ -204,7 +202,7 @@ 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_i18n_rails_js-rails70>=1.3<2.0:devel/rubygem-gettext_i18n_rails_js-rails70 \
+	rubygem-gettext_i18n_rails_js-rails70>=2.0.0<2.1:devel/rubygem-gettext_i18n_rails_js-rails70 \
 	rubygem-gettext>=3.3<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 \
@@ -212,7 +210,7 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-webrick>=1.8.1<1.9:www/rubygem-webrick \
 	rubygem-prometheus-client-mmap>=0.28.1<0.29:devel/rubygem-prometheus-client-mmap \
 	rubygem-warning>=1.3.0<1.4:devel/rubygem-warning \
-	rubygem-gitlab-dangerfiles>=4.3.2<4.4:devel/rubygem-gitlab-dangerfiles \
+	rubygem-gitlab-dangerfiles>=4.6.0<4.7:devel/rubygem-gitlab-dangerfiles \
 	rubygem-license_finder>=7.0.0<8:devel/rubygem-license_finder \
 	rubygem-rspec>=3.0<4:devel/rubygem-rspec \
 	rubygem-octokit6>=6.0<7:net/rubygem-octokit6 \
@@ -233,7 +231,7 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-gitaly>=16.5.0.rc1<16.6.0:net/rubygem-gitaly \
 	rubygem-kas-grpc>=0.2.0,1<0.3.0,1:net/rubygem-kas-grpc \
 	rubygem-grpc>=1.58.0<2:net/rubygem-grpc \
-	rubygem-google-protobuf>=3.24.4<4:devel/rubygem-google-protobuf \
+	rubygem-google-protobuf>=3.25<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 \
@@ -263,7 +261,7 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-parser>=3.2.2.4:devel/rubygem-parser \
 	rubygem-cvss-suite>=3.0.1<3.1:security/rubygem-cvss-suite \
 	rubygem-arr-pm>=0.0.12<0.1:devel/rubygem-arr-pm \
-	rubygem-devfile>=0.0.23.p.a1<0.0.24:net/rubygem-devfile \
+	rubygem-devfile>=0.0.24.p.a1<0.0.25:net/rubygem-devfile \
 	rubygem-CFPropertyList>=3.0.0<3.1:devel/rubygem-CFPropertyList \
 	rubygem-app_store_connect>=0:net/rubygem-app_store_connect \
 	rubygem-telesignenterprise>=2.2<3:devel/rubygem-telesignenterprise \
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index 712458a2c8244..229972432be88 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1698824612
-SHA256 (gitlab-foss-v16.5.1.tar.bz2) = 2c19faf78e80761d5c67790967d6c743c1beea1c47d2ae69814a794b92a12ce3
-SIZE (gitlab-foss-v16.5.1.tar.bz2) = 92734138
+TIMESTAMP = 1700424479
+SHA256 (gitlab-foss-v16.6.0.tar.bz2) = c3c7acc923aebdb002a8473ef382d2405f2f59beada4e2b5d283699ea852c7ef
+SIZE (gitlab-foss-v16.6.0.tar.bz2) = 100385518
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index 093ff686fa1b0..0b578297fcccc 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -1,6 +1,6 @@
---- Gemfile.orig	2023-10-30 16:33:01 UTC
+--- Gemfile.orig	2023-11-15 09:14:25 UTC
 +++ Gemfile
-@@ -56,7 +56,7 @@ gem 'neighbor', '~> 0.2.3' # rubocop:todo Gemfile/Miss
+@@ -57,7 +57,7 @@ gem 'neighbor', '~> 0.2.3' # rubocop:todo Gemfile/Miss
  
  gem 'rugged', '~> 1.6' # rubocop:todo Gemfile/MissingFeatureCategory
  
@@ -9,7 +9,7 @@
  gem 'marginalia', '~> 1.11.1' # rubocop:todo Gemfile/MissingFeatureCategory
  
  # Authorization
-@@ -76,8 +76,8 @@ gem 'omniauth-azure-activedirectory-v2', '~> 2.0' # ru
+@@ -77,8 +77,8 @@ gem 'omniauth-azure-activedirectory-v2', '~> 2.0' # ru
  gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md # rubocop:todo Gemfile/MissingFeatureCategory
  gem 'omniauth-dingtalk-oauth2', '~> 1.0' # rubocop:todo Gemfile/MissingFeatureCategory
  gem 'omniauth-alicloud', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -20,7 +20,7 @@
  gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md # rubocop:todo Gemfile/MissingFeatureCategory
  gem 'omniauth-google-oauth2', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory
  gem 'omniauth-oauth2-generic', '~> 0.2.2' # rubocop:todo Gemfile/MissingFeatureCategory
-@@ -88,7 +88,7 @@ gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/o
+@@ -89,7 +89,7 @@ gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/o
  gem 'omniauth_openid_connect', '~> 0.6.1' # rubocop:todo Gemfile/MissingFeatureCategory
  # Locked until Ruby 3.0 upgrade since upgrading will pull in an updated net-smtp gem.
  # See https://docs.gitlab.com/ee/development/emails.html#rationale.
@@ -29,7 +29,7 @@
  gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md # rubocop:todo Gemfile/MissingFeatureCategory
  gem 'omniauth-atlassian-oauth2', '~> 0.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
  gem 'rack-oauth2', '~> 1.21.3' # rubocop:todo Gemfile/MissingFeatureCategory
-@@ -178,7 +178,7 @@ gem 'gitlab-fog-azure-rm', '~> 1.8.0', require: 'fog/a
+@@ -179,7 +179,7 @@ gem 'gitlab-fog-azure-rm', '~> 1.8.0', require: 'fog/a
  
  # for Google storage
  gem 'google-cloud-storage', '~> 1.44.0' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -38,19 +38,19 @@
  gem 'google-apis-compute_v1', '~> 0.57.0' # rubocop:todo Gemfile/MissingFeatureCategory
  gem 'google-apis-container_v1', '~> 0.43.0' # rubocop:todo Gemfile/MissingFeatureCategory
  gem 'google-apis-container_v1beta1', '~> 0.43.0' # rubocop:todo Gemfile/MissingFeatureCategory
-@@ -196,9 +196,9 @@ gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/Missi
+@@ -197,9 +197,9 @@ gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/Missi
  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.185.1' # rubocop:todo Gemfile/MissingFeatureCategory
-+gem 'aws-sdk-core', '~> 3.185' # rubocop:todo Gemfile/MissingFeatureCategory
+-gem 'aws-sdk-core', '~> 3.186.0' # rubocop:todo Gemfile/MissingFeatureCategory
++gem 'aws-sdk-core', '~> 3.186' # rubocop:todo Gemfile/MissingFeatureCategory
  gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory
 -gem 'aws-sdk-s3', '~> 1.136.0' # rubocop:todo Gemfile/MissingFeatureCategory
 +gem 'aws-sdk-s3', '~> 1.136' # 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
  
-@@ -385,80 +385,10 @@ gem 'prometheus-client-mmap', '~> 0.28', '>= 0.28.1', 
+@@ -385,86 +385,10 @@ gem 'prometheus-client-mmap', '~> 0.28', '>= 0.28.1', 
  
  gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
  
@@ -68,11 +68,17 @@
 -  gem 'sprite-factory', '~> 1.7' # rubocop:todo Gemfile/MissingFeatureCategory
 -
 -  gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory
+-
+-  gem 'ruby-lsp', "~> 0.12.3", feature_category: :tooling
+-
+-  gem 'ruby-lsp-rails', "~> 0.2.7", feature_category: :tooling
+-
+-  gem 'ruby-lsp-rspec', "~> 0.1.5", feature_category: :tooling
 -end
 -
 -group :development, :test do
 -  gem 'deprecation_toolkit', '~> 1.5.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory
--  gem 'bullet', '~> 7.1.1' # rubocop:todo Gemfile/MissingFeatureCategory
+-  gem 'bullet', '~> 7.1.2' # rubocop:todo Gemfile/MissingFeatureCategory
 -  gem 'parser', '~> 3.2', '>= 3.2.2.4' # rubocop:todo Gemfile/MissingFeatureCategory
 -  gem 'pry-byebug' # rubocop:todo Gemfile/MissingFeatureCategory
 -  gem 'pry-rails', '~> 0.3.9' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -80,7 +86,7 @@
 -
 -  gem 'awesome_print', require: false # rubocop:todo Gemfile/MissingFeatureCategory
 -
--  gem 'database_cleaner', '~> 1.7.0' # rubocop:todo Gemfile/MissingFeatureCategory
+-  gem 'database_cleaner-active_record', '~> 2.1.0', feature_category: :database
 -  gem 'factory_bot_rails', '~> 6.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
 -  gem 'rspec-rails', '~> 6.0.3' # rubocop:todo Gemfile/MissingFeatureCategory
 -
@@ -90,7 +96,7 @@
 -  gem 'spring', '~> 4.1.0' # rubocop:todo Gemfile/MissingFeatureCategory
 -  gem 'spring-commands-rspec', '~> 1.0.4' # rubocop:todo Gemfile/MissingFeatureCategory
 -
--  gem 'gitlab-styles', '~> 10.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
+-  gem 'gitlab-styles', '~> 11.0.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
 -
 -  gem 'haml_lint', '~> 0.40.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
 -  gem 'bundler-audit', '~> 0.9.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory
@@ -104,7 +110,7 @@
 -
 -  gem 'knapsack', '~> 1.21.1', feature_category: :tooling
 -  gem 'crystalball', '~> 0.7.0', require: false, feature_category: :tooling
--  gem 'test_file_finder', '~> 0.1.3', feature_category: :tooling
+-  gem 'test_file_finder', '~> 0.2.1', feature_category: :tooling
 -
 -  gem 'simple_po_parser', '~> 1.1.6', require: false # rubocop:todo Gemfile/MissingFeatureCategory
 -
@@ -118,7 +124,7 @@
 -end
 -
  group :development, :test, :danger do
-   gem 'gitlab-dangerfiles', '~> 4.3.2', require: false, feature_category: :tooling
+   gem 'gitlab-dangerfiles', '~> 4.6.0', require: false, feature_category: :tooling
  end
  
 -group :development, :test, :coverage do
@@ -131,7 +137,7 @@
  # Gems required in omnibus-gitlab pipeline
  group :development, :test, :omnibus do
    gem 'license_finder', '~> 7.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-@@ -470,35 +400,6 @@ group :development, :test, :monorepo do
+@@ -476,35 +400,6 @@ group :development, :test, :monorepo do
    gem 'rspec_flaky', path: 'gems/rspec_flaky' # rubocop:todo Gemfile/MissingFeatureCategory
  end
  
@@ -144,7 +150,7 @@
 -
 -  gem 'capybara', '~> 3.39', '>= 3.39.2' # rubocop:todo Gemfile/MissingFeatureCategory
 -  gem 'capybara-screenshot', '~> 1.0.26' # rubocop:todo Gemfile/MissingFeatureCategory
--  gem 'selenium-webdriver', '~> 4.14' # rubocop:todo Gemfile/MissingFeatureCategory
+-  gem 'selenium-webdriver', '~> 4.15' # rubocop:todo Gemfile/MissingFeatureCategory
 -
 -  gem 'graphlyte', '~> 1.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
 -
@@ -161,22 +167,22 @@
 -  # 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.3.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
+-  gem 'gitlab_quality-test_tooling', '~> 1.5.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
 -end
 -
  gem 'octokit', '~> 6.0' # rubocop:todo Gemfile/MissingFeatureCategory
  
  gem 'gitlab-mail_room', '~> 0.0.23', require: 'mail_room' # rubocop:todo Gemfile/MissingFeatureCategory
-@@ -536,7 +437,7 @@ gem 'gitaly', '~> 16.5.0.pre.rc1' # rubocop:todo Gemfi
+@@ -542,7 +437,7 @@ gem 'gitaly', '~> 16.5.0.pre.rc1' # rubocop:todo Gemfi
  # KAS GRPC protocol definitions
  gem 'kas-grpc', '~> 0.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
  
 -gem 'grpc', '~> 1.58.0' # rubocop:todo Gemfile/MissingFeatureCategory
 +gem 'grpc', '~> 1.58' # rubocop:todo Gemfile/MissingFeatureCategory
  
- gem 'google-protobuf', '~> 3.24', '>= 3.24.4' # rubocop:todo Gemfile/MissingFeatureCategory
+ gem 'google-protobuf', '~> 3.25' # rubocop:todo Gemfile/MissingFeatureCategory
  
-@@ -557,7 +458,7 @@ gem 'grape_logging', '~> 1.8', feature_category: :api
+@@ -563,7 +458,7 @@ gem 'grape_logging', '~> 1.8', feature_category: :api
  gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfile/MissingFeatureCategory
  
  # Countries list
@@ -185,7 +191,7 @@
  
  gem 'retriable', '~> 3.1.2' # rubocop:todo Gemfile/MissingFeatureCategory
  
-@@ -623,6 +524,7 @@ gem 'app_store_connect' # rubocop:todo Gemfile/Missing
+@@ -629,6 +524,7 @@ gem 'app_store_connect' # rubocop:todo Gemfile/Missing
  gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemfile/MissingFeatureCategory
  
  # BufferedIO patch
@@ -193,7 +199,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:
-@@ -630,3 +532,9 @@ gem 'net-protocol', '~> 0.1.3' # rubocop:todo Gemfile/
+@@ -636,3 +532,9 @@ 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-config_initializers_1__settings.rb b/www/gitlab-ce/files/patch-config_initializers_1__settings.rb
index 9260864dbcce1..9d1d73bbf17c9 100644
--- a/www/gitlab-ce/files/patch-config_initializers_1__settings.rb
+++ b/www/gitlab-ce/files/patch-config_initializers_1__settings.rb
@@ -1,6 +1,6 @@
---- config/initializers/1_settings.rb.orig	2023-09-21 08:56:19 UTC
+--- config/initializers/1_settings.rb.orig	2023-11-15 09:14:25 UTC
 +++ config/initializers/1_settings.rb
-@@ -207,11 +207,7 @@ Settings.gitlab['url'] ||= Settings.__send__(:build_gi
+@@ -208,11 +208,7 @@ Settings.gitlab['url'] ||= Settings.__send__(:build_gi
  Settings.gitlab['user'] ||= 'git'
  # External configuration may cause the ssh user to differ from the GitLab user
  Settings.gitlab['ssh_user'] ||= Settings.gitlab.user
diff --git a/www/gitlab-ce/files/patch-lib_gitlab_patch_sidekiq__cron__poller.rb b/www/gitlab-ce/files/patch-lib_gitlab_patch_sidekiq__cron__poller.rb
deleted file mode 100644
index 858010032dd96..0000000000000
--- a/www/gitlab-ce/files/patch-lib_gitlab_patch_sidekiq__cron__poller.rb
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/gitlab/patch/sidekiq_cron_poller.rb.orig	2023-05-22 18:44:12 UTC
-+++ lib/gitlab/patch/sidekiq_cron_poller.rb
-@@ -7,7 +7,7 @@
- require 'sidekiq/version'
- require 'sidekiq/cron/version'
- 
--if Gem::Version.new(Sidekiq::VERSION) != Gem::Version.new('6.5.7')
-+if Gem::Version.new(Sidekiq::VERSION) != Gem::Version.new('6.5.12')
-   raise 'New version of sidekiq detected, please remove or update this patch'
- end
- 
diff --git a/www/gitlab-ce/pkg-message b/www/gitlab-ce/pkg-message
index a3344fb637eb3..c496cd992353f 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.4-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/16.6-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.3-16.4-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/16.5-16.6-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 a5b558a82c4da..08167388ad2f9 100644
--- a/www/gitlab-pages/Makefile
+++ b/www/gitlab-pages/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitlab-pages
-PORTVERSION=	16.5.1
+PORTVERSION=	16.6.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 25c25068ec12b..2b7a0475e06f9 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1698824640
-SHA256 (go/www_gitlab-pages/gitlab-pages-v16.5.1/go.mod) = 896ed13d735e4b95bdedd317e789dd6429222d38c651f1baae0bed413d5602a6
-SIZE (go/www_gitlab-pages/gitlab-pages-v16.5.1/go.mod) = 2931
-SHA256 (go/www_gitlab-pages/gitlab-pages-v16.5.1/gitlab-pages-v16.5.1.tar.bz2) = b46864767334aadba6b9e85b5505df266a6360f06611cd17fbc35ba05df355c5
-SIZE (go/www_gitlab-pages/gitlab-pages-v16.5.1/gitlab-pages-v16.5.1.tar.bz2) = 203554
+TIMESTAMP = 1700424584
+SHA256 (go/www_gitlab-pages/gitlab-pages-v16.6.0/go.mod) = 896ed13d735e4b95bdedd317e789dd6429222d38c651f1baae0bed413d5602a6
+SIZE (go/www_gitlab-pages/gitlab-pages-v16.6.0/go.mod) = 2931
+SHA256 (go/www_gitlab-pages/gitlab-pages-v16.6.0/gitlab-pages-v16.6.0.tar.bz2) = 9184bc09af687a542ccb2dac40dbe96de7f99ea1a4bbd975a4ba9a9182493db5
+SIZE (go/www_gitlab-pages/gitlab-pages-v16.6.0/gitlab-pages-v16.6.0.tar.bz2) = 203557
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index 305f104283fa1..a0e565621a35e 100644
--- a/www/gitlab-workhorse/Makefile
+++ b/www/gitlab-workhorse/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitlab-workhorse
-PORTVERSION=	16.5.1
+PORTVERSION=	16.6.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
@@ -10,7 +10,7 @@ WWW=		https://gitlab.com/gitlab-org/gitlab-workhorse
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
-BUILD_DEPENDS=	git>=2.39.2:devel/git
+BUILD_DEPENDS=	git>=2.42.0:devel/git
 RUN_DEPENDS=	p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool
 
 USES=		gmake go:modules,no_targets
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index 7026c2d75a25f..48cd96d5d0951 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1698824556
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.5.1/go.mod) = 98d1e08c1c106673b32c20697c616efeca50d2b698293aa282fd75be90e89b82
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.5.1/go.mod) = 6781
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.5.1/gitlab-foss-v16.5.1.tar.bz2) = 2c19faf78e80761d5c67790967d6c743c1beea1c47d2ae69814a794b92a12ce3
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.5.1/gitlab-foss-v16.5.1.tar.bz2) = 92734138
+TIMESTAMP = 1700424573
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.6.0/go.mod) = 0e1bcdae15ade3adcbcb2cf71f00c404f5fe6b0e8962b1d82f3fa8f320aeee6e
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.6.0/go.mod) = 6652
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.6.0/gitlab-foss-v16.6.0.tar.bz2) = c3c7acc923aebdb002a8473ef382d2405f2f59beada4e2b5d283699ea852c7ef
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.6.0/gitlab-foss-v16.6.0.tar.bz2) = 100385518