diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 271949401ec1..46db254d8467 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,87 +1,74 @@
 PORTNAME=	gitaly
-DISTVERSION=	16.3.5
+DISTVERSION=	16.4.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Smart reverse proxy for GitLab
 WWW=		https://gitlab.com/gitlab-org/gitaly
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 # Make sure the following patch is included:
 # https://gitlab.com/gitlab-org/gitaly/-/merge_requests/4108
 # it fixes segfaults reported here: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=259848
 
 # define dependencies that are required for build and run under MY_DEPENDS
 MY_DEPENDS=	git>=2.41.0:devel/git
 BUILD_DEPENDS=	bash>0:shells/bash \
 		${LOCALBASE}/bin/cmake:devel/cmake-core \
 		${MY_DEPENDS}
-RUN_DEPENDS=	${MY_DEPENDS} \
-		gitlab-shell>=14.17.0:devel/gitlab-shell
+RUN_DEPENDS=	${MY_DEPENDS}
 LIB_DEPENDS=	libpcre2-8.so:devel/pcre2 \
 		libhttp_parser.so:www/http-parser
 
 USES=		cpe gmake go:modules,no_targets iconv pkgconfig ssl
 
 CPE_VENDOR=	gitlab
 
 MAKE_ENV=	GOFLAGS="${GO_BUILDFLAGS}"
 # make sure to pass go build options into make process
 MAKE_ENV+=	${GO_ENV}
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 
-USE_GITHUB=	nodefault
-# Check used version here: https://gitlab.com/gitlab-org/gitaly/-/blob/v16.3.1/Makefile#L181
-# We use here a patched version that is including some patches already merged into 1.7 branch which fixes problems with FreeBSD 14
-# https://github.com/libgit2/libgit2/commit/251408cfd4ff8112efaa5c82ec81c9574c4bf022
-# https://github.com/libgit2/libgit2/commit/213d35ea6d69598693b7f4b5b737aa98c91ba98e
-GH_TUPLE=	mfechner:libgit2:3bd8f66803c056325d5835d1fbc0c2db2ef89d06:build_deps_libgit2_source
-
 # for go dependencies
 # Gitlab hosts there dependencies on their own platform and not on go-proxy
 # so we download the required go.mod file from gitlab
 # lines are taken from go.mk
 # ---------------------------
 FETCH_DEPENDS=	${GO_CMD}:${GO_PORT} \
 		ca_root_nss>0:security/ca_root_nss
 MASTER_SITES+=	https://gitlab.com/gitlab-org/gitaly/-/raw/v${DISTVERSION}/
 DISTFILES+=	go.mod
 DIST_SUBDIR=	go/${PKGORIGIN:S,/,_,g}/${DISTNAME}
 EXTRACT_ONLY+=	${DISTFILES:N*.mod\:*:N*.mod:C/:.*//}
 _USES_fetch+=	800:go-post-fetch
 go-post-fetch:
 	@${ECHO_MSG} "===> Fetching ${GO_MODNAME} dependencies";
 	@(cd ${DISTDIR}/${DIST_SUBDIR}; \
 		[ -e go.mod ] || ${RLN} ${GO_MODFILE} go.mod; \
 		${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all)
 # ---------------------------
 
-post-extract:
-	${MKDIR} ${WRKSRC}/_build/deps/libgit2
-	@${RM} -r ${WORKSRC}/_build/deps/libgit2/source
-	@${RLN} ${WRKSRC_build_deps_libgit2_source} ${WRKSRC}/_build/deps/libgit2/source
-
 post-patch:
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example
 	${MV} ${WRKSRC}/config.toml.example ${WRKSRC}/config.toml.sample
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${DATADIR}/bin
 	${FIND} ${WRKSRC} -name '*.orig' -delete
 	(cd ${WRKSRC}/_build/bin/ && ${COPYTREE_BIN} .  ${STAGEDIR}${DATADIR}/bin && \
 	cd ${WRKSRC} && ${COPYTREE_SHARE} config.toml.sample  ${STAGEDIR}${DATADIR})
 
 post-install:
 	${FIND} -s ${STAGEDIR}${DATADIR} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' | \
 		${SED} -E -e '/sample$$/ s#^#@sample #; \
 		/gitlab-shell-hook$$/ s#^#@(,,755) #; \
 		s#${DATADIR_REL}/bin#@(,,555) ${DATADIR_REL}/bin#; ' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 7bc962385e5e..44c990213364 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,7 +1,5 @@
-TIMESTAMP = 1695958229
-SHA256 (go/devel_gitaly/gitaly-v16.3.5/go.mod) = 90b3743fb25526e4b77aeca1a9b00d0a99c5288da835d80bf29121fb2a211db2
-SIZE (go/devel_gitaly/gitaly-v16.3.5/go.mod) = 10532
-SHA256 (go/devel_gitaly/gitaly-v16.3.5/mfechner-libgit2-3bd8f66803c056325d5835d1fbc0c2db2ef89d06_GH0.tar.gz) = a86257b2563d588c3080cf8845c9bd812f52a45ca375862a05a5b9c45e7d7ddd
-SIZE (go/devel_gitaly/gitaly-v16.3.5/mfechner-libgit2-3bd8f66803c056325d5835d1fbc0c2db2ef89d06_GH0.tar.gz) = 5883130
-SHA256 (go/devel_gitaly/gitaly-v16.3.5/gitaly-v16.3.5.tar.bz2) = f7ce644d65b1ade76c99b0495a0d0c726245b266280524e4280ecb54bfaec1b7
-SIZE (go/devel_gitaly/gitaly-v16.3.5/gitaly-v16.3.5.tar.bz2) = 2461324
+TIMESTAMP = 1695542667
+SHA256 (go/devel_gitaly/gitaly-v16.4.0/go.mod) = 297ad42064334fe0bdeb8b428bffb4d36edffa43233dfa9c33a24c39d5d3c2f3
+SIZE (go/devel_gitaly/gitaly-v16.4.0/go.mod) = 10499
+SHA256 (go/devel_gitaly/gitaly-v16.4.0/gitaly-v16.4.0.tar.bz2) = b799fd9627dbc5f7bd8f8841c5b22591880f47bb7e99d040749fb45276bf3cad
+SIZE (go/devel_gitaly/gitaly-v16.4.0/gitaly-v16.4.0.tar.bz2) = 2450967
diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile
deleted file mode 100644
index b9ed01951a7f..000000000000
--- a/devel/gitaly/files/patch-Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.orig	2023-08-21 09:20:49 UTC
-+++ Makefile
-@@ -628,16 +628,16 @@ ${DEPENDENCY_DIR}/protoc.version: dependency-version |
- 	${Q}[ x"$$(cat "$@" 2>/dev/null)" = x"${PROTOC_VERSION} ${PROTOC_BUILD_OPTIONS}" ] || >$@ echo -n "${PROTOC_VERSION} ${PROTOC_BUILD_OPTIONS}"
- 
- ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a: ${DEPENDENCY_DIR}/libgit2.version
--	${Q}${GIT} -c init.defaultBranch=master init ${GIT_QUIET} ${LIBGIT2_SOURCE_DIR}
--	${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" config remote.origin.url ${LIBGIT2_REPO_URL}
--	${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" config remote.origin.tagOpt --no-tags
--	${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" fetch --depth 1 ${GIT_QUIET} origin ${LIBGIT2_VERSION}
--	${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" checkout ${GIT_QUIET} --detach FETCH_HEAD
-+	#${Q}${GIT} -c init.defaultBranch=master init ${GIT_QUIET} ${LIBGIT2_SOURCE_DIR}
-+	#${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" config remote.origin.url ${LIBGIT2_REPO_URL}
-+	#${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" config remote.origin.tagOpt --no-tags
-+	#${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" fetch --depth 1 ${GIT_QUIET} origin ${LIBGIT2_VERSION}
-+	#${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" checkout ${GIT_QUIET} --detach FETCH_HEAD
- 	${Q}rm -rf ${LIBGIT2_BUILD_DIR}
- 	${Q}mkdir -p ${LIBGIT2_BUILD_DIR}
- 	${Q}cd ${LIBGIT2_BUILD_DIR} && cmake ${LIBGIT2_SOURCE_DIR} ${LIBGIT2_BUILD_OPTIONS}
- 	${Q}CMAKE_BUILD_PARALLEL_LEVEL=$(shell nproc) cmake --build ${LIBGIT2_BUILD_DIR} --target install
--	go install -a github.com/libgit2/git2go/${GIT2GO_VERSION}
-+	#go install -a github.com/libgit2/git2go/${GIT2GO_VERSION}
- 
- # This target is responsible for checking out Git sources. In theory, we'd only
- # need to depend on the source directory. But given that the source directory
diff --git a/devel/gitaly/files/patch-config.toml.example b/devel/gitaly/files/patch-config.toml.example
index 6b6db835cd9f..96757cb8bbc4 100644
--- a/devel/gitaly/files/patch-config.toml.example
+++ b/devel/gitaly/files/patch-config.toml.example
@@ -1,77 +1,73 @@
---- config.toml.example.orig	2023-08-21 09:20:49 UTC
+--- config.toml.example.orig	2023-09-21 08:51:45 UTC
 +++ config.toml.example
 @@ -2,10 +2,10 @@
  # Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and
  # https://docs.gitlab.com/ee//administration/gitaly/reference
  
 -socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket"
 +socket_path = "%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/gitaly.socket"
  
  # The directory where Gitaly's executables are stored
 -bin_dir = "/home/git/gitaly/_build/bin"
 +bin_dir = "%%PREFIX%%/share/gitaly/bin/"
  
  # # Optional: The directory where Gitaly can create all files required to
  # # properly operate at runtime. If not set, Gitaly will create a directory in
 @@ -22,7 +22,7 @@ bin_dir = "/home/git/gitaly/_build/bin"
  # # Optional: configure where the Gitaly creates the sockets for internal connections. If unset, Gitaly will create a randomly
  # # named temp directory each time it boots.
  # # Non Gitaly clients should never connect to these sockets.
 -# internal_socket_dir = "/home/git/gitlab/tmp/sockets/private/internal"
 +internal_socket_dir = "%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/internal"
  
  # # Optional: authenticate Gitaly requests using a shared secret
  # [auth]
 @@ -33,9 +33,9 @@ bin_dir = "/home/git/gitaly/_build/bin"
  # certificate_path = '/home/git/cert.cert'
  # key_path = '/home/git/key.pem'
  
 -# # Git settings
 -# [git]
 -# bin_path = "/usr/bin/git"
 +# Git settings
 +[git]
 +bin_path = "%%PREFIX%%/bin/git"
  # catfile_cache_size = 100
  #
  # [[git.config]]
 @@ -44,7 +44,7 @@ bin_dir = "/home/git/gitaly/_build/bin"
  
  [[storage]]
  name = "default"
 -path = "/home/git/repositories"
 +path = "%%PREFIX%%/git/repositories"
  
  # # You can optionally configure more storages for this Gitaly instance to serve up
  #
 @@ -54,9 +54,9 @@ path = "/home/git/repositories"
  #
  
  # # You can optionally configure Gitaly to output JSON-formatted log messages to stdout
 -# [logging]
 +[logging]
  # # The directory where Gitaly stores extra log files
 -dir = "/home/git/gitlab/log"
 +dir = "%%PREFIX%%/www/gitlab-ce/log"
  # format = "json"
  # # Optional: Set log level to only log entries with that severity or above
  # # One of, in order: debug, info, warn, errror, fatal, panic
-@@ -72,14 +72,14 @@ dir = "/home/git/gitlab/log"
- 
- [gitlab-shell]
- # The directory where gitlab-shell is installed
--dir = "/home/git/gitlab-shell"
-+dir = "%%PREFIX%%/share/gitlab-shell"
+@@ -71,11 +71,11 @@ dir = "/home/git/gitlab/log"
+ # grpc_latency_buckets = [0.001, 0.005, 0.025, 0.1, 0.5, 1.0, 10.0, 30.0, 60.0, 300.0, 1500.0]
  
  [hooks]
 -custom_hooks_dir = "/home/git/custom_hooks"
 +custom_hooks_dir = "%%PREFIX%%/git/custom_hooks"
  
  [gitlab]
 -secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret"
 -url = "http+unix://%2Fhome%2Fgit%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket"
 +secret_file = "%%PREFIX%%/share/gitlab-shell/.gitlab_shell_secret"
 +url = "http+unix://%2Fusr%2Flocal%2Fwww%2Fgitlab-ce%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket"
  # Only needed if a UNIX socket is used in `url` and GitLab is configured to
  # use a relative path (e.g. /gitlab).
  # relative_url_root = '/'
diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile
index f754f6c0193d..1a3e0df5b3a8 100644
--- a/devel/gitlab-shell/Makefile
+++ b/devel/gitlab-shell/Makefile
@@ -1,84 +1,83 @@
 PORTNAME=	gitlab-shell
-PORTVERSION=	14.26.0
-PORTREVISION=	1
+PORTVERSION=	14.28.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	GitLab Shell handles git commands for GitLab
 WWW=		https://gitlab.com/gitlab-org/gitlab-shell
 
 LICENSE=	MIT
 
 # GSSAPI support can maybe be removed by disable CGO:
 # https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/720
 #BUILD_DEPENDS=	heimdal>=0:security/heimdal
 
 USES=		gmake go:modules,no_targets pkgconfig
 CGO_ENABLED=	0
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 
 USERS=		git
 GROUPS=		git
 
 #INSTALL_TARGET=	install-strip
 ALL_TARGET=	build
 
 MAKE_ENV=	GOFLAGS="${GO_BUILDFLAGS}"
 # make sure to pass go build options into make process
 MAKE_ENV+=	${GO_ENV}
 
 # for go dependencies
 # Gitlab hosts there dependencies on their own platform and not on go-proxy
 # so we download the required go.mod file from gitlab
 # lines are taken from go.mk
 # ---------------------------
 FETCH_DEPENDS=	${GO_CMD}:${GO_PORT} \
 		ca_root_nss>0:security/ca_root_nss
 MASTER_SITES+=	https://gitlab.com/gitlab-org/gitlab-shell/-/raw/v${DISTVERSION}/
 DISTFILES+=	go.mod
 DIST_SUBDIR=	go/${PKGORIGIN:S,/,_,g}/${DISTNAME}
 EXTRACT_ONLY+=	${DISTFILES:N*.mod\:*:N*.mod:C/:.*//}
 _USES_fetch+=	800:go-post-fetch
 go-post-fetch:
 	@${ECHO_MSG} "===> Fetching ${GO_MODNAME} dependencies";
 	@(cd ${DISTDIR}/${DIST_SUBDIR}; \
 		[ -e go.mod ] || ${RLN} ${GO_MODFILE} go.mod; \
 		${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all)
 # ---------------------------
 
 VARLOGDIR=	/var/log/gitlab-shell
 
 PLIST_FILES+=	"@dir(git,,755) ${VARLOGDIR}"
 
 post-patch:
 	${MV} ${WRKSRC}/config.yml.example ${WRKSRC}/config.yml.sample
 	${CP} ${WRKSRC}/config.yml.sample ${WRKSRC}/config.yml
 	${REINPLACE_CMD} -e 's|VERSION_STRING :=.*|VERSION_STRING := v${PORTVERSION}|g' ${WRKSRC}/Makefile
 
 pre-install:
 	${RM} -rf ${WRKSRC}/config.yml
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${DATADIR}/bin
 	${FIND} ${WRKSRC} -name '*.orig' -delete
 	(cd ${WRKSRC}/bin/ && ${COPYTREE_BIN} .  ${STAGEDIR}${DATADIR}/bin)
 .for x in CHANGELOG LICENSE README.md VERSION config.yml.sample
 	${INSTALL_DATA} ${WRKSRC}/${x} ${STAGEDIR}${DATADIR}/
 .endfor
 .for x in support
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${x}
 	(cd ${WRKSRC}/${x} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${x})
 .endfor
 	@${MKDIR} ${STAGEDIR}${VARLOGDIR}
 
 post-install:
 	${FIND} -s ${STAGEDIR}${DATADIR} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' | \
 		${SED} -E -e '/sample$$/ s#^#@sample #; \
 		s#${DATADIR_REL}/bin#@(,,555) ${DATADIR_REL}/bin#; ' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/devel/gitlab-shell/distinfo b/devel/gitlab-shell/distinfo
index 0b617d9297b5..65883998ebb8 100644
--- a/devel/gitlab-shell/distinfo
+++ b/devel/gitlab-shell/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1693643697
-SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.26.0/go.mod) = 8ef118a7179202ed0a6f2fd52e53c29fef23b668421f086e19b7f965c884c317
-SIZE (go/devel_gitlab-shell/gitlab-shell-v14.26.0/go.mod) = 4705
-SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.26.0/gitlab-shell-v14.26.0.tar.bz2) = a2e75107010f8ef90d6695c11a2cf2a726de6ecfbf4c69262a36f33f96028da1
-SIZE (go/devel_gitlab-shell/gitlab-shell-v14.26.0/gitlab-shell-v14.26.0.tar.bz2) = 132666
+TIMESTAMP = 1695535027
+SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.28.0/go.mod) = 2292bfa79e6f9f98d5b482bd81b2dfe6bc95076d046085359a0f9019b306f462
+SIZE (go/devel_gitlab-shell/gitlab-shell-v14.28.0/go.mod) = 4767
+SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.28.0/gitlab-shell-v14.28.0.tar.bz2) = cfb56533b26d55e99ee807c50fbb09c170f62522b0a58ef7652747ab645b3dcc
+SIZE (go/devel_gitlab-shell/gitlab-shell-v14.28.0/gitlab-shell-v14.28.0.tar.bz2) = 140420
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index 813e17c652ab..efec0bb3feaf 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -1,457 +1,455 @@
 PORTNAME=	gitlab-ce
-PORTVERSION=	16.3.5
+PORTVERSION=	16.4.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www devel
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Web GUI for managing git repositories
 WWW=		https://gitlab.com/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 # the rubygems of RUN_DEPENDS matches the order of the Gemfile
 # which makes maintaining this long list much easier!
 # devel/rubygem-parser is required for database upgrade process
 # see https://gitlab.com/gitlab-org/gitlab/-/issues/350866
 # mail/rubygem-net-smtp is required as ruby 3.1 removed it
 # textproc/rubygem-psych3 is required as ruby 3.1 applied an update to psych 4.0 which has breaking changes
 # 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.3.10:textproc/gitlab-elasticsearch-indexer \
-	gitlab-agent>=16.3.0:net/gitlab-agent \
-	gitlab-metrics-exporter>0:devel/gitlab-metrics-exporter \
+	gitlab-agent>=16.4.0:net/gitlab-agent \
 	gitlab-pages>=${PORTVERSION}:www/gitlab-pages \
-	gitlab-shell>=14.26.0:devel/gitlab-shell \
+	gitlab-shell>=14.28.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} \
 	gtar>0:archivers/gtar \
 	bash>0:shells/bash \
 	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.6<7.1:www/rubygem-rails70 \
+	rubygem-vite_rails-rails70>=0:devel/rubygem-vite_rails-rails70 \
 	rubygem-bootsnap>=1.16.0<1.17: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.2.0<3.3:devel/rubygem-view_component-rails70 \
-	rubygem-pg>=1.5.3<1.6:databases/rubygem-pg \
+	rubygem-view_component-rails70>=3.5.0<3.6: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-grape-path-helpers>=1.7.1<1.8:devel/rubygem-grape-path-helpers \
 	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-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 \
-	rubygem-rexml>=3.2.5<3.3:textproc/rubygem-rexml \
+	rubygem-rexml>=3.2.6<3.3:textproc/rubygem-rexml \
 	rubygem-ruby-saml>=1.15.0<1.16:security/rubygem-ruby-saml \
 	rubygem-omniauth>=2.1.0<3:security/rubygem-omniauth \
 	rubygem-omniauth-auth0>=3.1.0<3.2.0:net/rubygem-omniauth-auth0 \
 	rubygem-omniauth-azure-activedirectory-v2>=2.0<3:net/rubygem-omniauth-azure-activedirectory-v2 \
 	rubygem-omniauth-dingtalk-oauth2>=1.0.1<2:security/rubygem-omniauth-dingtalk-oauth2 \
 	rubygem-omniauth-alicloud>=2.0.1<2.1:security/rubygem-omniauth-alicloud \
 	rubygem-omniauth-facebook>=4.0.0:net/rubygem-omniauth-facebook \
 	rubygem-omniauth-github>=2.0.1<2.1:net/rubygem-omniauth-github \
 	rubygem-omniauth-google-oauth2>=1.1<2:net/rubygem-omniauth-google-oauth2 \
 	rubygem-omniauth-oauth2-generic>=0.2.2<0.3.0:security/rubygem-omniauth-oauth2-generic \
 	rubygem-omniauth-saml>=2.1.0<3:security/rubygem-omniauth-saml \
 	rubygem-omniauth-shibboleth-redux>=2.0<3:security/rubygem-omniauth-shibboleth-redux \
 	rubygem-omniauth-twitter>=1.4<2.0:net/rubygem-omniauth-twitter \
 	rubygem-omniauth_openid_connect>=0.6.1<0.7.0:net/rubygem-omniauth_openid_connect \
 	rubygem-openid_connect>=1.3.1<1.3.2:net/rubygem-openid_connect \
 	rubygem-omniauth-atlassian-oauth2>=0.2.0<0.3:security/rubygem-omniauth-atlassian-oauth2 \
 	rubygem-rack-oauth21>=1.21.3<1.22.0:security/rubygem-rack-oauth21 \
 	rubygem-jwt>=2.5<3:www/rubygem-jwt \
 	rubygem-gssapi>=1.3.1<1.4:security/rubygem-gssapi \
 	rubygem-recaptcha>=5.12<6.0:devel/rubygem-recaptcha \
 	rubygem-akismet>=3.0<4.0:devel/rubygem-akismet \
-	rubygem-invisible_captcha>=2.0.0<2.1.0:graphics/rubygem-invisible_captcha \
+	rubygem-invisible_captcha>=2.1.0<2.2.0:graphics/rubygem-invisible_captcha \
 	rubygem-devise-two-factor40-rails70>=4.0.2<4.1:security/rubygem-devise-two-factor40-rails70 \
 	rubygem-rqrcode-rails3>=0.1.7<0.2.0:www/rubygem-rqrcode-rails3 \
-	rubygem-validates_hostname>=1.0.11<1.1.0:dns/rubygem-validates_hostname \
+	rubygem-validates_hostname>=1.0.13<1.1.0:dns/rubygem-validates_hostname \
 	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-gpgme>=2.0.22<2.1.0:security/rubygem-gpgme \
+	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 \
 	rubygem-grape17>=1.7.0<1.8:devel/rubygem-grape17 \
 	rubygem-grape-entity>=0.10.0<0.11.0,1:devel/rubygem-grape-entity \
-	rubygem-rack-cors>=1.1.1<1.2.0:www/rubygem-rack-cors \
+	rubygem-rack-cors>=2.0.1<2.1:www/rubygem-rack-cors \
 	rubygem-grape-swagger>=1.6.1<1.7:devel/rubygem-grape-swagger \
 	rubygem-grape-swagger-entity>=0.5.1<0.6:devel/rubygem-grape-swagger-entity \
-	rubygem-graphql>=1.13.12<1.14:devel/rubygem-graphql \
-	rubygem-graphiql-rails>=1.8<2:devel/rubygem-graphiql-rails \
+	rubygem-graphql>=1.13.19<1.14:devel/rubygem-graphql \
+	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-graphql-docs>=2.1.0<2.2.0:devel/rubygem-graphql-docs \
 	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 \
 	rubygem-kaminari-rails70>=1.2.2<1.3:www/rubygem-kaminari-rails70 \
 	rubygem-hamlit>=2.15.0<2.16:www/rubygem-hamlit \
 	rubygem-carrierwave>=1.3.2<2.0:www/rubygem-carrierwave \
 	rubygem-mini_magick410>=4.10.1<4.11:graphics/rubygem-mini_magick410 \
 	rubygem-fog-aws>=3.18<4:net/rubygem-fog-aws \
 	rubygem-fog-core210>=2.1.0<2.1.1:devel/rubygem-fog-core210 \
 	rubygem-fog-google>=1.19<2:net/rubygem-fog-google \
 	rubygem-fog-local>=0.8<1.0:net/rubygem-fog-local \
 	rubygem-fog-aliyun>=0.4<1.0:net/rubygem-fog-aliyun \
 	rubygem-gitlab-fog-azure-rm>=1.8.0<1.9:net/rubygem-gitlab-fog-azure-rm \
 	rubygem-google-cloud-storage>=1.44.0<1.45:net/rubygem-google-cloud-storage \
 	rubygem-google-apis-core>=0.10.0<0.12:devel/rubygem-google-apis-core \
 	rubygem-google-apis-compute_v1_057>=0.57.0<0.58:devel/rubygem-google-apis-compute_v1_057 \
 	rubygem-google-apis-container_v1>=0.43.0<0.44:devel/rubygem-google-apis-container_v1 \
 	rubygem-google-apis-container_v1beta1>=0.43.0<0.44:devel/rubygem-google-apis-container_v1beta1 \
 	rubygem-google-apis-cloudbilling_v1>=0.21.0<0.22:devel/rubygem-google-apis-cloudbilling_v1 \
 	rubygem-google-apis-cloudresourcemanager_v1>=0.31.0<0.32:devel/rubygem-google-apis-cloudresourcemanager_v1 \
 	rubygem-google-apis-iam_v1>=0.36.0<0.37:devel/rubygem-google-apis-iam_v1 \
 	rubygem-google-apis-serviceusage_v1>=0.28.0<0.29:devel/rubygem-google-apis-serviceusage_v1 \
 	rubygem-google-apis-sqladmin_v1beta4_041>=0.41.0<0.42:devel/rubygem-google-apis-sqladmin_v1beta4_041 \
 	rubygem-google-apis-androidpublisher_v3034>=0.34.0<0.35:devel/rubygem-google-apis-androidpublisher_v3034 \
-	rubygem-unf>=0.1.4<0.2.0:textproc/rubygem-unf \
 	rubygem-seed-fu>=2.3.7<2.4.0:databases/rubygem-seed-fu \
 	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.180.3<4:devel/rubygem-aws-sdk-core \
+	rubygem-aws-sdk-core>=3.181.1<4:devel/rubygem-aws-sdk-core \
 	rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \
-	rubygem-aws-sdk-s3>=1.132.1<2:devel/rubygem-aws-sdk-s3 \
+	rubygem-aws-sdk-s3>=1.134.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.2<2.4:www/rubygem-deckar01-task_list \
+	rubygem-deckar01-task_list>=2.3.3<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 \
 	rubygem-redcloth>=4.3.2<4.4.0:www/rubygem-redcloth \
 	rubygem-rdoc63>=6.3.2<7:devel/rubygem-rdoc63 \
 	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 \
 	rubygem-asciidoctor>=2.0.18<2.1.0:textproc/rubygem-asciidoctor \
 	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-rouge>=4.1.3<4.2:textproc/rubygem-rouge \
 	rubygem-truncato>=0.7.11<0.8.0:textproc/rubygem-truncato \
 	rubygem-nokogiri>=1.15.4<2:textproc/rubygem-nokogiri \
 	rubygem-icalendar>=0:devel/rubygem-icalendar \
 	rubygem-diffy>=3.4<4:textproc/rubygem-diffy \
 	rubygem-diff_match_patch>=0.1.0<0.2.0:textproc/rubygem-diff_match_patch \
 	rubygem-rack22>=2.2.8,3<2.3,3:www/rubygem-rack22 \
 	rubygem-rack-timeout>=0.6.3<0.7:www/rubygem-rack-timeout \
-	rubygem-puma>=6.3<7:www/rubygem-puma \
+	rubygem-puma>=6.3.1<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-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-fugit>=1.8.1<1.9:devel/rubygem-fugit \
-	rubygem-httparty020>=0.20.0<0.21:www/rubygem-httparty020 \
+	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>=1.7.0<1.8.0:devel/rubygem-re2 \
+	rubygem-re2>=2.0.0<2.0.1:devel/rubygem-re2 \
 	rubygem-semver_dialects12>=1.2.1<1.3:devel/rubygem-semver_dialects12 \
 	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-connection_pool>=2.2.5<3.0:net/rubygem-connection_pool \
 	rubygem-redis-actionpack-rails70>=5.3.0<5.4: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-slack-messenger>=2.3.4<2.4.0:devel/rubygem-slack-messenger \
 	rubygem-hangouts-chat>=0.0.5<0.1.0:net/rubygem-hangouts-chat \
 	rubygem-asana1>=0.10.13<3:www/rubygem-asana1 \
 	rubygem-ruby-fogbugz>=0.3.0<0.4.0:devel/rubygem-ruby-fogbugz \
 	rubygem-kubeclient>=4.11.0<4.12.0:www/rubygem-kubeclient \
 	rubygem-ruby-openai37>=3.7<4:www/rubygem-ruby-openai37 \
 	rubygem-circuitbox>=2.0.0<2.1:www/rubygem-circuitbox \
-	rubygem-sanitize>=6.0<7:textproc/rubygem-sanitize \
+	rubygem-sanitize60>=6.0.2<6.1:textproc/rubygem-sanitize60 \
 	rubygem-babosa>=2.0<3:textproc/rubygem-babosa \
 	rubygem-loofah>=2.21.3<2.22:textproc/rubygem-loofah \
-	rubygem-licensee>=9.15<10:devel/rubygem-licensee \
+	rubygem-licensee>=9.16<10:devel/rubygem-licensee \
 	rubygem-charlock_holmes>=0.7.7<0.8.0:textproc/rubygem-charlock_holmes \
 	rubygem-ruby-magic>=0.6<1:devel/rubygem-ruby-magic \
-	rubygem-fast_blank>=0:devel/rubygem-fast_blank \
+	rubygem-fast_blank>=1.0.1<1.1:devel/rubygem-fast_blank \
 	rubygem-gitlab-chronic>=0.10.5<0.11.0:devel/rubygem-gitlab-chronic \
-	rubygem-gitlab_chronic_duration>=0.10.6.2<0.10.7:devel/rubygem-gitlab_chronic_duration \
-	rubygem-rack-proxy>=0.7.6<0.8.0:www/rubygem-rack-proxy \
+	rubygem-gitlab_chronic_duration>=0.11<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-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.6<1:graphics/rubygem-tanuki_emoji \
+	rubygem-tanuki_emoji>=0.7<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 \
 	rubygem-gitlab-license>=2.3<3:devel/rubygem-gitlab-license \
 	rubygem-rack-attack>=6.7.0<6.8:www/rubygem-rack-attack \
 	rubygem-sentry-raven>=3.1<4.0:devel/rubygem-sentry-raven \
 	rubygem-sentry-ruby>=5.8.0<5.9:devel/rubygem-sentry-ruby \
 	rubygem-sentry-rails>=5.8.0<5.9:devel/rubygem-sentry-rails \
 	rubygem-sentry-sidekiq>=5.8.0<5.9:devel/rubygem-sentry-sidekiq \
 	rubygem-pg_query>=4.2.3<4.3:databases/rubygem-pg_query \
 	rubygem-premailer-rails110-rails70>=1.10.3<1.11:mail/rubygem-premailer-rails110-rails70 \
 	rubygem-gitlab-labkit>=0.34.0<0.35:devel/rubygem-gitlab-labkit \
 	rubygem-thrift>=0.16.0:devel/rubygem-thrift \
-	rubygem-ruby_parser>=3.20<4.0:devel/rubygem-ruby_parser \
 	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>=3.3<4:devel/rubygem-gettext \
 	rubygem-batch-loader>=2.0.1<2.1:devel/rubygem-batch-loader \
 	rubygem-peek-rails70>=1.1.0<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>=0.27<0.28:devel/rubygem-prometheus-client-mmap \
+	rubygem-prometheus-client-mmap>=0.28<0.29:devel/rubygem-prometheus-client-mmap \
 	rubygem-warning>=1.3.0<1.4:devel/rubygem-warning \
 	rubygem-license_finder>=7.0.0<8:devel/rubygem-license_finder \
-	rubygem-gitlab-dangerfiles>=3.13.0<3.14:devel/rubygem-gitlab-dangerfiles \
+	rubygem-gitlab-dangerfiles>=4.0.0<4.1:devel/rubygem-gitlab-dangerfiles \
 	rubygem-rspec>=3.0<4:devel/rubygem-rspec \
-	rubygem-octokit5>=4.20<6.0:net/rubygem-octokit5 \
+	rubygem-octokit6>=6.0<7:net/rubygem-octokit6 \
 	rubygem-gitlab-mail_room>=0.0.23<0.1.0:mail/rubygem-gitlab-mail_room \
 	rubygem-email_reply_trimmer>=0.1<1.0:mail/rubygem-email_reply_trimmer \
 	rubygem-html2text>=0:textproc/rubygem-html2text \
 	rubygem-stackprof>=0.2.25<0.3:devel/rubygem-stackprof \
 	rubygem-rbtrace>=0.4.14<1.0:devel/rubygem-rbtrace \
 	rubygem-memory_profiler>=1.0<2.0:devel/rubygem-memory_profiler \
 	rubygem-benchmark-memory>=0.1<1.0:benchmarks/rubygem-benchmark-memory \
 	rubygem-activerecord-explain-analyze>=0.1<1.0:databases/rubygem-activerecord-explain-analyze \
 	rubygem-oauth2>=2.0<3:net/rubygem-oauth2 \
 	rubygem-health_check-rails70>=3.0<4:devel/rubygem-health_check-rails70 \
 	rubygem-vmstat>=2.3.0<2.4.0:sysutils/rubygem-vmstat \
 	rubygem-sys-filesystem>=1.4.3<1.5:sysutils/rubygem-sys-filesystem \
 	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.2.0.pre.rc4<16.3.0:net/rubygem-gitaly \
+	rubygem-gitaly>=16.3.0.rc1<16.4.0:net/rubygem-gitaly \
 	rubygem-kas-grpc>=0.2.0,1<0.3.0,1:net/rubygem-kas-grpc \
 	rubygem-grpc>=1.55.0<2:net/rubygem-grpc \
-	rubygem-google-protobuf323>=3.23.4<4:devel/rubygem-google-protobuf323 \
+	rubygem-google-protobuf>=3.24.3<4:devel/rubygem-google-protobuf \
 	rubygem-toml-rb>=2.2.0<3:www/rubygem-toml-rb \
-	rubygem-flipper025>=0.25.0<0.26:devel/rubygem-flipper025 \
-	rubygem-flipper-active_record-rails70>=0.25.0<0.26:databases/rubygem-flipper-active_record-rails70 \
-	rubygem-flipper-active_support_cache_store-rails70>=0.25.0<0.26:devel/rubygem-flipper-active_support_cache_store-rails70 \
+	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 \
+	rubygem-flipper-active_support_cache_store-rails70>=0.26.2<0.27:devel/rubygem-flipper-active_support_cache_store-rails70 \
 	rubygem-unleash>=3.2.2<3.3:devel/rubygem-unleash \
-	rubygem-gitlab-experiment>=0.7.0<0.8:devel/rubygem-gitlab-experiment \
+	rubygem-gitlab-experiment>=0.8.0<0.9: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-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 \
 	rubygem-lru_redux>0:devel/rubygem-lru_redux \
 	rubygem-mail>=2.8.1<2.8.2,2:mail/rubygem-mail \
-	rubygem-lockbox>=1.1.1<1.2:security/rubygem-lockbox \
+	rubygem-lockbox>=1.3.0<1.4:security/rubygem-lockbox \
 	rubygem-valid_email>=0.1<1:mail/rubygem-valid_email \
 	rubygem-jsonb_accessor>=1.3.10<1.4:www/rubygem-jsonb_accessor \
 	rubygem-json>=2.6.3<3:devel/rubygem-json \
 	rubygem-json_schemer>=0.2.18<0.3:devel/rubygem-json_schemer \
 	rubygem-oj313>=3.13.21<3.14:devel/rubygem-oj313 \
 	rubygem-oj-introspect>=0.7<1:devel/rubygem-oj-introspect \
 	rubygem-multi_json114>=1.14.1<1.15:devel/rubygem-multi_json114 \
 	rubygem-yajl-ruby>=1.4.3<1.5:devel/rubygem-yajl-ruby \
 	rubygem-webauthn>=3.0<4:security/rubygem-webauthn \
 	rubygem-ipaddress>=0.8.3<0.9:net/rubygem-ipaddress \
 	rubygem-parslet1>=1.8<2:textproc/rubygem-parslet1 \
 	rubygem-ed25519>=1.3.0<1.4:security/rubygem-ed25519 \
 	rubygem-parser>=0: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.22.p.a1<0.0.23: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 \
 	rubygem-net-protocol01>=0.1.3<0.2:net/rubygem-net-protocol01 \
 	rubygem-net-http011>=0.1.1<0.1.2:www/rubygem-net-http011 \
 	rubygem-duo_api>=1.3<2:security/rubygem-duo_api \
 	rubygem-google-cloud-profiler-v2>=0.3<1:textproc/rubygem-google-cloud-profiler-v2
 
 
 BUILD_DEPENDS=	gem:devel/ruby-gems \
 	${MY_DEPENDS}
 
 RUN_DEPENDS=	${MY_DEPENDS}
 
 CONFLICTS_INSTALL=	gitolite \
 			gitolite2 \
 			gogs \
 			gitea \
 			gitosis
 
 USES=		go:modules nodejs:env ruby shebangfix
 
 USE_RC_SUBR=	gitlab
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 GL_PROJECT=	gitlab-foss
 
 USERS=	git
 GROUPS=	git
 
 NO_BUILD=	yes
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=			KERBEROS
 OPTIONS_DEFAULT=		KERBEROS
 
 KERBEROS_BUILD_DEPENDS=		rubygem-timfel-krb5-auth>=0.8<1:security/rubygem-timfel-krb5
 KERBEROS_RUN_DEPENDS=		rubygem-timfel-krb5-auth>=0.8<1:security/rubygem-timfel-krb5
 KERBEROS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-Gemfile-kerberos-off
 
 SHEBANG_FILES=	scripts/build_qa_image \
 		scripts/build_gdk_image \
 		scripts/db_tasks \
 		scripts/rails-update-bisect \
 		scripts/generate-e2e-pipeline \
 		scripts/frontend/execute-on-staged-files.sh \
 		scripts/frontend/start_storybook.sh \
 		scripts/partitioning/generate-fk \
 		.lefthook/pre-push/merge_conflicts \
 		qa/gdk/entrypoint \
 		qa/bin/test
 
 post-patch:
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config/gitlab.yml.example \
 		${WRKSRC}/config/puma.rb.example \
 		${WRKSRC}/lib/support/nginx/gitlab \
 		${WRKSRC}/lib/support/nginx/gitlab-ssl
 	# Remove symlink a create a file with content
 	${RM} ${WRKSRC}/GITLAB_WORKHORSE_VERSION
 	${ECHO} ${PORTVERSION} > ${WRKSRC}/GITLAB_WORKHORSE_VERSION
 
 do-install:
 	${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample
 	(cd ${WRKSRC} && ${RM} Gemfile.lock && bundle install --local)
 	${RM} -R ${WRKSRC}/workhorse
 	# Has only a Gemfile.lock, so remove it, is maybe fixed by a newer version
 	${RM} -R ${WRKSRC}/vendor/gems/omniauth-google-oauth2
 	${FIND} ${WRKSRC} -name '*.orig' -delete
 	${FIND} ${WRKSRC} -name '*.bak' -delete
 	${FIND} ${WRKSRC} -name '*.gitkeep' -delete
 	${FIND} ${WRKSRC} -name '*.gitignore' -delete
 	${FIND} ${WRKSRC} -name "Gemfile.lock" -delete
 	${MV} ${WRKSRC}/config/initializers/relative_url.rb.sample ${WRKSRC}/config/initializers/relative_url.rb.example
 	# get files for workdir with: find . -name "*.example"
 	${MV} ${WRKSRC}/config/puma.rb.example ${WRKSRC}/config/puma.rb.sample
 	${MV} ${WRKSRC}/config/secrets.yml.example ${WRKSRC}/config/secrets.yml.sample
 	${MV} ${WRKSRC}/config/sidekiq.yml.example ${WRKSRC}/config/sidekiq.yml.sample
 	${MV} ${WRKSRC}/config/cable.yml.example ${WRKSRC}/config/cable.yml.sample
 	${MV} ${WRKSRC}/config/gitlab.yml.example ${WRKSRC}/config/gitlab.yml.sample
 	${MV} ${WRKSRC}/config/initializers/devise_password_length.rb.example ${WRKSRC}/config/initializers/devise_password_length.rb.sample
 	${MV} ${WRKSRC}/config/resque.yml.example ${WRKSRC}/config/resque.yml.sample
 	${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
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/assets
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/uploads
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/cache
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/sessions
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/backups
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/sockets/private/internal
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/shared/tmp
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/shared/artifacts/tmp/work
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/vendor/assets/stylesheets
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/workhorse/changelogs/unreleased
 	# Skip file having an executable bit
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/${PORTNAME} "-not ( -type f -perm -a=x )")
 	# now copy all files having an execution bit and preserve to x bit (this fixes some issues we saw)
 	(cd ${WRKSRC} && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/www/${PORTNAME} "-type f -perm -a=x")
 
 post-install:
 	${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' | \
 		${SED} -E -e '/sample$$/ s#^#@sample #; \
 		/secrets.yml.sample$$/ s#^@sample #@sample(git,www,0600) #; \
 		s#${WWWDIR_REL}/bin#@(git,,544) ${WWWDIR_REL}/bin#; \
 		/db\/schema.rb$$|gitlab.po$$|gitlab.pot$$|gitlab.po.time_stamp$$|locale\/index.js$$/ s#^#@(git,,) #;' >> ${TMPPLIST}
 	@${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/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}
 	@${ECHO_CMD} "@dir(git,git,554) ${WWWDIR_REL}/bin" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/config" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/builds" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/lib/assets" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/bg" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/de" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/eo" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/es" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/fil_PH" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/fr" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/id_ID" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/it" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/ja" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/ko" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/nl_NL" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/pl_PL" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/pt_BR" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/ru" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/tr_TR" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/uk" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/zh_CN" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/zh_HK" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/zh_TW" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/log" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/public" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/public/assets" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/public/uploads" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/2_plan" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/4_verify" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/5_package" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/6_release" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/7_configure" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/8_monitor" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/browser_ui/5_package" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/browser_ui/8_monitor" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/tmp" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/spec/support/gitlab-git-test.git/refs/heads" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/spec/support/gitlab-git-test.git/refs/tags" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,755) ${WWWDIR_REL}/shared" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp/cache" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp/uploads" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp/work" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/ci_secure_files" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/shared/packages" >> ${TMPPLIST}
 	@${ECHO_CMD} "@group gitlab-pages" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/shared/pages" >> ${TMPPLIST}
 	@${ECHO_CMD} "@group www" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/terraform_state" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/tmp" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/lfs-objects" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/registry" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/backups" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/cache" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/feature_flags" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/pids" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir/puma" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir/sidekiq" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir/unicorn" >> ${TMPPLIST}
 	#@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/run" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sessions" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sockets" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sockets/private" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sockets/private/internal" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/vendor" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/vendor/assets" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/vendor/assets/stylesheets" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/workhorse/changelogs/unreleased" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index f5193d15a714..b1bdcafef6ab 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1695958128
-SHA256 (gitlab-foss-v16.3.5.tar.bz2) = c84906ef3a4a44e7c3e0a4bea407673647347b5b9d00263ee6ea53f75d29692e
-SIZE (gitlab-foss-v16.3.5.tar.bz2) = 91305629
+TIMESTAMP = 1695534531
+SHA256 (gitlab-foss-v16.4.0.tar.bz2) = 87c14776bc7a22dbba53d2a25256aad2cb031e578014445cc4e298b39eb9caa2
+SIZE (gitlab-foss-v16.4.0.tar.bz2) = 96949969
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index 2ae8a42038e2..6689126ecf28 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -1,215 +1,208 @@
---- Gemfile.orig	2023-08-21 09:25:45 UTC
+--- Gemfile.orig	2023-09-21 08:56:19 UTC
 +++ Gemfile
-@@ -46,7 +46,7 @@ gem 'neighbor', '~> 0.2.3'
+@@ -48,7 +48,7 @@ gem 'neighbor', '~> 0.2.3'
  gem 'rugged', '~> 1.6'
  gem 'grape-path-helpers', '~> 1.7.1'
  
 -gem 'faraday', '~> 1.0'
 +gem 'faraday', '>= 1.0'
  gem 'marginalia', '~> 1.11.1'
  
  # Authorization
-@@ -66,8 +66,8 @@ gem 'omniauth-azure-activedirectory-v2', '~> 2.0'
+@@ -68,8 +68,8 @@ gem 'omniauth-azure-activedirectory-v2', '~> 2.0'
  gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md
  gem 'omniauth-dingtalk-oauth2', '~> 1.0'
  gem 'omniauth-alicloud', '~> 2.0.1'
 -gem 'omniauth-facebook', '~> 4.0.0'
 -gem 'omniauth-github', '2.0.1'
 +gem 'omniauth-facebook', '>= 4.0.0'
 +gem 'omniauth-github', '~> 2.0.1'
  gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md
  gem 'omniauth-google-oauth2', '~> 1.1'
  gem 'omniauth-oauth2-generic', '~> 0.2.2'
-@@ -78,7 +78,7 @@ gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/o
+@@ -80,7 +80,7 @@ gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/o
  gem 'omniauth_openid_connect', '~> 0.6.1'
  # 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.
 -gem 'openid_connect', '= 1.3.0'
 +gem 'openid_connect', '= 1.3.1'
  gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md
  gem 'omniauth-atlassian-oauth2', '~> 0.2.0'
  gem 'rack-oauth2', '~> 1.21.3'
-@@ -166,7 +166,7 @@ gem 'gitlab-fog-azure-rm', '~> 1.8.0', require: 'fog/a
+@@ -168,7 +168,7 @@ gem 'gitlab-fog-azure-rm', '~> 1.8.0', require: 'fog/a
  
  # for Google storage
  gem 'google-cloud-storage', '~> 1.44.0'
 -gem 'google-apis-core', '~> 0.10.0'
 +gem 'google-apis-core', '~> 0.10'
  gem 'google-apis-compute_v1', '~> 0.57.0'
  gem 'google-apis-container_v1', '~> 0.43.0'
  gem 'google-apis-container_v1beta1', '~> 0.43.0'
-@@ -187,9 +187,9 @@ gem 'seed-fu', '~> 2.3.7'
+@@ -186,9 +186,9 @@ gem 'seed-fu', '~> 2.3.7'
  gem 'elasticsearch-model', '~> 7.2'
  gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation'
  gem 'elasticsearch-api',   '7.13.3'
--gem 'aws-sdk-core', '~> 3.180.3'
-+gem 'aws-sdk-core', '~> 3.180'
+-gem 'aws-sdk-core', '~> 3.181.1'
++gem 'aws-sdk-core', '~> 3.181'
  gem 'aws-sdk-cloudformation', '~> 1'
--gem 'aws-sdk-s3', '~> 1.132.1'
-+gem 'aws-sdk-s3', '~> 1.132'
+-gem 'aws-sdk-s3', '~> 1.134.0'
++gem 'aws-sdk-s3', '~> 1.134'
  gem 'faraday_middleware-aws-sigv4', '~>0.3.0'
  gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections
  
-@@ -289,7 +289,7 @@ gem 'slack-messenger', '~> 2.3.4'
+@@ -288,7 +288,7 @@ gem 'slack-messenger', '~> 2.3.4'
  gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat'
  
  # Asana integration
 -gem 'asana', '~> 0.10.13'
 +gem 'asana', '>= 0.10.13'
  
  # FogBugz integration
  gem 'ruby-fogbugz', '~> 0.3.0'
-@@ -385,78 +385,10 @@ gem 'prometheus-client-mmap', '~> 0.27', require: 'pro
+@@ -381,118 +381,15 @@ gem 'prometheus-client-mmap', '~> 0.28', require: 'pro
  
  gem 'warning', '~> 1.3.0'
  
 -group :development do
 -  gem 'lefthook', '~> 1.4.7', require: false
 -  gem 'rubocop'
 -  gem 'solargraph', '~> 0.47.2', require: false
 -
 -  gem 'letter_opener_web', '~> 2.0.0'
 -  gem 'lookbook', '~> 2.0', '>= 2.0.1'
 -
 -  # Better errors handler
 -  gem 'better_errors', '~> 2.10.1'
 -
 -  gem 'sprite-factory', '~> 1.7'
 -
 -  gem "listen", "~> 3.7"
 -end
 -
 -group :development, :test do
 -  gem 'deprecation_toolkit', '~> 1.5.1', require: false
 -  gem 'bullet', '~> 7.0.2'
 -  gem 'parser', '~> 3.2', '>= 3.2.2.3'
 -  gem 'pry-byebug'
 -  gem 'pry-rails', '~> 0.3.9'
 -  gem 'pry-shell', '~> 0.6.4'
 -
 -  gem 'awesome_print', require: false
 -
 -  gem 'database_cleaner', '~> 1.7.0'
 -  gem 'factory_bot_rails', '~> 6.2.0'
 -  gem 'rspec-rails', '~> 6.0.3'
 -
 -  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
 -  gem 'minitest', '~> 5.11.0'
 -
 -  gem 'spring', '~> 4.1.0'
 -  gem 'spring-commands-rspec', '~> 1.0.4'
 -
 -  gem 'gitlab-styles', '~> 10.1.0', require: false
 -
 -  gem 'haml_lint', '~> 0.40.0', require: false
 -  gem 'bundler-audit', '~> 0.7.0.1', require: false
 -
 -  # Benchmarking & profiling
 -  gem 'benchmark-ips', '~> 2.11.0', require: false
 -  gem 'benchmark-memory', '~> 0.1', require: false
 -
 -  gem 'knapsack', '~> 1.21.1'
 -  gem 'crystalball', '~> 0.7.0', require: false
 -
 -  gem 'simple_po_parser', '~> 1.1.6', require: false
 -
 -  gem 'png_quantizator', '~> 0.2.1', require: false
 -
 -  gem 'parallel', '~> 1.19', require: false
 -
 -  gem 'test_file_finder', '~> 0.1.3'
 -
 -  gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup'
 -
 -  gem 'pact', '~> 1.63'
 -end
 -
  group :development, :test, :danger do
-   gem 'gitlab-dangerfiles', '~> 3.13.0', require: false
+   gem 'gitlab-dangerfiles', '~> 4.0.0', require: false
  end
  
 -group :development, :test, :coverage do
 -  gem 'simplecov', '~> 0.21', require: false
 -  gem 'simplecov-lcov', '~> 0.8.0', require: false
 -  gem 'simplecov-cobertura', '~> 2.1.0', require: false
 -  gem 'undercover', '~> 0.4.4', require: false
 -end
 -
  # Gems required in omnibus-gitlab pipeline
  group :development, :test, :omnibus do
    gem 'license_finder', '~> 7.0', require: false
-@@ -468,37 +400,8 @@ group :development, :test, :monorepo do
-   gem 'rspec_flaky', path: 'gems/rspec_flaky'
  end
  
+-# Gems required in various pipelines
+-group :development, :test, :monorepo do
+-  gem 'gitlab-rspec', path: 'gems/gitlab-rspec'
+-  gem 'rspec_flaky', path: 'gems/rspec_flaky'
+-end
+-
 -group :test do
 -  gem 'fuubar', '~> 2.2.0'
 -  gem 'rspec-retry', '~> 0.6.2'
 -  gem 'rspec_profiling', '~> 0.0.6'
 -  gem 'rspec-benchmark', '~> 0.6.0'
 -  gem 'rspec-parameterized', '~> 1.0', require: false
-+gem 'octokit', '>= 4.15'
- 
+-
 -  gem 'capybara', '~> 3.39', '>= 3.39.2'
 -  gem 'capybara-screenshot', '~> 1.0.26'
--  gem 'selenium-webdriver', '= 4.11.0'
+-  gem 'selenium-webdriver', '= 4.12.0'
 -
 -  gem 'graphlyte', '~> 1.0.0'
 -
 -  gem 'shoulda-matchers', '~> 5.1.0', require: false
 -  gem 'email_spec', '~> 2.2.0'
--  gem 'webmock', '~> 3.18.1'
+-  gem 'webmock', '~> 3.19.1'
 -  gem 'rails-controller-testing'
 -  gem 'concurrent-ruby', '~> 1.1'
 -  gem 'test-prof', '~> 1.2.2'
 -  gem 'rspec_junit_formatter'
 -  gem 'guard-rspec'
 -  gem 'axe-core-rspec'
 -
 -  # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
 -  gem 'derailed_benchmarks', require: false
 -
--  gem 'gitlab_quality-test_tooling', '~> 0.9.3', require: false
+-  gem 'gitlab_quality-test_tooling', '~> 1.0.0', require: false
 -end
 -
--gem 'octokit', '~> 4.15'
--
- gem 'gitlab-mail_room', '~> 0.0.23', require: 'mail_room'
+ gem 'octokit', '~> 6.0'
  
- gem 'email_reply_trimmer', '~> 0.1'
-@@ -534,14 +437,14 @@ gem 'gitaly', '~> 16.2.0-rc4'
+ gem 'gitlab-mail_room', '~> 0.0.23', require: 'mail_room'
+@@ -530,7 +427,7 @@ gem 'gitaly', '~> 16.3.0-rc1'
  # KAS GRPC protocol definitions
  gem 'kas-grpc', '~> 0.2.0'
  
 -gem 'grpc', '~> 1.55.0'
 +gem 'grpc', '~> 1.55'
  
- gem 'google-protobuf', '~> 3.23', '>= 3.23.4'
- 
- gem 'toml-rb', '~> 2.2.0'
+ gem 'google-protobuf', '~> 3.24', '>= 3.24.3'
  
- # Feature toggles
--gem 'flipper', '~> 0.25.0'
-+gem 'flipper', '>= 0.25.0'
- gem 'flipper-active_record', '~> 0.25.0'
- gem 'flipper-active_support_cache_store', '~> 0.25.0'
- gem 'unleash', '~> 3.2.2'
-@@ -555,7 +458,7 @@ gem 'grape_logging', '~> 1.8'
+@@ -551,7 +448,7 @@ gem 'grape_logging', '~> 1.8'
  gem 'gitlab-net-dns', '~> 0.9.2'
  
  # Countries list
 -gem 'countries', '~> 4.0.0'
 +gem 'countries', '~> 4.0'
  
  gem 'retriable', '~> 3.1.2'
  
-@@ -628,3 +531,9 @@ gem 'net-protocol', '~> 0.1.3'
+@@ -624,3 +521,9 @@ gem 'net-protocol', '~> 0.1.3'
  gem 'net-http', '= 0.1.1'
  
  gem 'duo_api', '~> 1.3'
 +
 +gem 'parser'
 +gem 'net-smtp'
 +gem 'net-pop'
 +gem 'psych', '~> 3.1'
 +
diff --git a/www/gitlab-ce/files/patch-config_database.yml.postgresql b/www/gitlab-ce/files/patch-config_database.yml.postgresql
index 775a4dd2ff27..c0b66431bfeb 100644
--- a/www/gitlab-ce/files/patch-config_database.yml.postgresql
+++ b/www/gitlab-ce/files/patch-config_database.yml.postgresql
@@ -1,58 +1,64 @@
---- config/database.yml.postgresql.orig	2023-05-18 16:48:55 UTC
+--- config/database.yml.postgresql.orig	2023-09-21 08:56:19 UTC
 +++ config/database.yml.postgresql
 @@ -26,13 +26,6 @@ production:
      username: git
      password: "secure password"
      host: localhost
 -  geo:
 -    adapter: postgresql
 -    encoding: unicode
 -    database: gitlabhq_geo_production
 -    username: git
 -    password: "secure password"
 -    host: localhost
  
  #
  # Development specific
 @@ -57,13 +50,6 @@ development:
      host: localhost
      variables:
        statement_timeout: 15s
 -  geo:
 -    adapter: postgresql
 -    encoding: unicode
 -    database: gitlabhq_geo_development
 -    username: postgres
 -    password: "secure password"
 -    host: localhost
  
  #
  # Staging specific
 @@ -84,13 +70,6 @@ staging:
      username: git
      password: "secure password"
      host: localhost
 -  geo:
 -    adapter: postgresql
 -    encoding: unicode
 -    database: gitlabhq_geo_staging
 -    username: git
 -    password: "secure password"
 -    host: localhost
  
  # Warning: The database defined as "test" will be erased and
  # re-generated from your development database when you run "rake".
-@@ -117,13 +96,6 @@ test: &test
-     prepared_statements: false
+@@ -119,19 +98,3 @@ test: &test
+     reaping_frequency: nil
      variables:
        statement_timeout: 15s
 -  geo:
 -    adapter: postgresql
 -    encoding: unicode
 -    database: gitlabhq_geo_test
 -    username: postgres
 -    password:
 -    host: localhost
-   embedding:
-     adapter: postgresql
-     encoding: unicode
+-    reaping_frequency: nil
+-  embedding:
+-    adapter: postgresql
+-    encoding: unicode
+-    database: gitlabhq_embedding_test
+-    username: postgres
+-    password:
+-    host: localhost
+-    reaping_frequency: nil
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 21f09d5a97e4..9260864dbcce 100644
--- a/www/gitlab-ce/files/patch-config_initializers_1__settings.rb
+++ b/www/gitlab-ce/files/patch-config_initializers_1__settings.rb
@@ -1,15 +1,15 @@
---- config/initializers/1_settings.rb.orig	2023-05-18 16:48:55 UTC
+--- config/initializers/1_settings.rb.orig	2023-09-21 08:56:19 UTC
 +++ config/initializers/1_settings.rb
-@@ -203,11 +203,7 @@ Settings.gitlab['url'] ||= Settings.__send__(:build_gi
+@@ -207,11 +207,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
 -Settings.gitlab['user_home'] ||= begin
 -  Etc.getpwnam(Settings.gitlab['user']).dir
 -rescue ArgumentError # no user configured
 -  '/home/' + Settings.gitlab['user']
 -end
 +Settings.gitlab['user_home'] ||= '/usr/local/git'
  Settings.gitlab['time_zone'] ||= nil
  Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil?
  Settings.gitlab['signin_enabled'] ||= true if Settings.gitlab['signin_enabled'].nil?
diff --git a/www/gitlab-ce/pkg-message b/www/gitlab-ce/pkg-message
index 7e2b60894f18..a3344fb637eb 100644
--- a/www/gitlab-ce/pkg-message
+++ b/www/gitlab-ce/pkg-message
@@ -1,33 +1,33 @@
 [
 {
   message: <<EOM
 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.3-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/16.4-freebsd.md
 EOM
   type: install
 }
 {
   message: "!! WARNING: Please make sure you read in UPDATING entry 20190423 !!"
   maximum_version: "11.9.7"
   type: upgrade
 }
 {
   message: <<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.1-16.3-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/16.3-16.4-freebsd.md
 
 If you just installed an minor upgrade of GitLab please follow
 the instructions in the guide at:
 
 https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/freebsd_patch_versions.md
 EOM
   type: upgrade
 }
 ]
 
diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile
index fe29f813d069..dd475e461ade 100644
--- a/www/gitlab-pages/Makefile
+++ b/www/gitlab-pages/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	gitlab-pages
-PORTVERSION=	16.3.5
+PORTVERSION=	16.4.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 MASTER_SITES+=	https://gitlab.com/gitlab-org/gitlab-pages/-/raw/v${DISTVERSION}/
 DISTFILES+=	go.mod
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Official GitLab Pages daemon
 WWW=		https://gitlab.com/gitlab-org/gitlab-pages
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
 GO_MODULE=	gitlab.com/gitlab-org/gitlab-pages
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 
 GO_BUILDFLAGS=	-ldflags="-X 'main.VERSION=${PORTVERSION}' -X 'main.REVISION=${GL_TAGNAME}'"
 
 USE_RC_SUBR=	gitlab_pages
 
 USERS=		gitlab-pages
 GROUPS=		gitlab-pages
 
 post-patch:
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/gitlab-pages.conf.sample
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${DATADIR}/bin
 	(cd ${WRKDIR}/bin/ && ${COPYTREE_BIN} .  ${STAGEDIR}${DATADIR}/bin)
 .for x in gitlab-pages.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/${x} ${STAGEDIR}${DATADIR}/
 .endfor
 
 post-install:
 	${FIND} -s ${STAGEDIR}${DATADIR} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' | \
 		${SED} -E -e '/sample$$/ s#^#@sample #; \
 		s#${DATADIR_REL}/bin#@(,,555) ${DATADIR_REL}/bin#; ' >> ${TMPPLIST}
 	cat ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index 6649cc20f978..54727bd41478 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1695958278
-SHA256 (go/www_gitlab-pages/gitlab-pages-v16.3.5/go.mod) = 7a4011638a58161a910eab69a49314def0475881a5257382da5c57fd429d0783
-SIZE (go/www_gitlab-pages/gitlab-pages-v16.3.5/go.mod) = 2987
-SHA256 (go/www_gitlab-pages/gitlab-pages-v16.3.5/gitlab-pages-v16.3.5.tar.bz2) = 9ab7da4e5a60a16a69bc11da8da77fa466803a86af545fb6471d68aadbff0486
-SIZE (go/www_gitlab-pages/gitlab-pages-v16.3.5/gitlab-pages-v16.3.5.tar.bz2) = 193368
+TIMESTAMP = 1695539785
+SHA256 (go/www_gitlab-pages/gitlab-pages-v16.4.0/go.mod) = 7c187a27bbe120e94adb41fb30ee7e5e0a5432bbae20db191a5e1deec02fc920
+SIZE (go/www_gitlab-pages/gitlab-pages-v16.4.0/go.mod) = 2957
+SHA256 (go/www_gitlab-pages/gitlab-pages-v16.4.0/gitlab-pages-v16.4.0.tar.bz2) = e8afe1b7e6da13fd3ddb7d67e388dbfdc128832b1c41c4688ab97dbcd9de0b9b
+SIZE (go/www_gitlab-pages/gitlab-pages-v16.4.0/gitlab-pages-v16.4.0.tar.bz2) = 190443
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index aea142eecc7c..f6c648749473 100644
--- a/www/gitlab-workhorse/Makefile
+++ b/www/gitlab-workhorse/Makefile
@@ -1,55 +1,55 @@
 PORTNAME=	gitlab-workhorse
-PORTVERSION=	16.3.5
+PORTVERSION=	16.4.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Smart reverse proxy for GitLab
 WWW=		https://gitlab.com/gitlab-org/gitlab-workhorse
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 BUILD_DEPENDS=	git>=2.39.2:devel/git
 RUN_DEPENDS=	p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool
 
 USES=		gmake go:modules,no_targets
 MAKE_ENV=	GOFLAGS="${GO_BUILDFLAGS}"
 MAKE_ENV+=	${GO_ENV}
 WRKSRC_SUBDIR=	workhorse
 # found in work/gitlab-foss*/workhorse/go.mod
 #GO_MODULE=	gitlab.com/gitlab-org/gitlab/workhorse
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 GL_PROJECT=	gitlab-foss
 
 # for go dependencies
 # Gitlab hosts there dependencies on their own platform and not on go-proxy
 # so we download the required go.mod file from gitlab
 # lines are taken from go.mk
 # ---------------------------
 FETCH_DEPENDS=	${GO_CMD}:${GO_PORT} \
 		ca_root_nss>0:security/ca_root_nss
 MASTER_SITES+=	https://gitlab.com/gitlab-org/gitlab-foss/-/raw/v${DISTVERSION}/workhorse/
 DISTFILES+=	go.mod
 DIST_SUBDIR=	go/${PKGORIGIN:S,/,_,g}/${DISTNAME}
 EXTRACT_ONLY+=	${DISTFILES:N*.mod\:*:N*.mod:C/:.*//}
 _USES_fetch+=	800:go-post-fetch
 go-post-fetch:
 	@${ECHO_MSG} "===> Fetching ${GO_MODNAME} dependencies";
 	@(cd ${DISTDIR}/${DIST_SUBDIR}; \
 		[ -e go.mod ] || ${RLN} ${GO_MODFILE} go.mod; \
 		${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all)
 # ---------------------------
 
 PLIST_FILES=	bin/gitlab-resize-image \
 		bin/gitlab-workhorse \
 		bin/gitlab-zip-cat \
 		bin/gitlab-zip-metadata
 PLIST_DIRS=	${WWWDIR}
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index b37b0ecdc012..318e65a240d2 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1695958201
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.3.5/go.mod) = 72d012b5c2c9d6d7f18273a2b347976bc6aa2619349419b7360a7b75d5247fef
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.3.5/go.mod) = 6561
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.3.5/gitlab-foss-v16.3.5.tar.bz2) = c84906ef3a4a44e7c3e0a4bea407673647347b5b9d00263ee6ea53f75d29692e
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.3.5/gitlab-foss-v16.3.5.tar.bz2) = 91305629
+TIMESTAMP = 1695539869
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.4.0/go.mod) = 6dbac21e68f49d022a392749e180c5297fee0f401dd9a96c86c8c1e1ae4165a1
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.4.0/go.mod) = 6691
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.4.0/gitlab-foss-v16.4.0.tar.bz2) = 87c14776bc7a22dbba53d2a25256aad2cb031e578014445cc4e298b39eb9caa2
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.4.0/gitlab-foss-v16.4.0.tar.bz2) = 96949969