diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index d111abd305d4..06d03e76085c 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,13 +1,13 @@
-TIMESTAMP = 1764508114
-SHA256 (go/devel_gitaly/gitaly-v18.6.1/go.mod) = 1aace7ab09969668d9aad9416851833a2ec122442b060ce133e60d1d7c9b0252
-SIZE (go/devel_gitaly/gitaly-v18.6.1/go.mod) = 14044
-SHA256 (go/devel_gitaly/gitaly-v18.6.1/gitaly-v18.6.1.tar.bz2) = 598192b4c0ea1f323ff085db5ff02e507d698456fdf5333e562f0360a319abbc
-SIZE (go/devel_gitaly/gitaly-v18.6.1/gitaly-v18.6.1.tar.bz2) = 4656878
-SHA256 (go/devel_gitaly/gitaly-v18.6.1/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4
-SIZE (go/devel_gitaly/gitaly-v18.6.1/git-v2.50.0.tar.bz2) = 9249878
-SHA256 (go/devel_gitaly/gitaly-v18.6.1/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = d3397b210ca156ed84ff69b3a7f6316c5026bd05d11455f23d8335473dceaf1b
-SIZE (go/devel_gitaly/gitaly-v18.6.1/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = 11822923
-SHA256 (go/devel_gitaly/gitaly-v18.6.1/gitlab-org-git-23466173824c0a0f835c0d790c2f38156ae6284a_GL0.tar.gz) = 01a4069b15e9262151b3b97f989d4939ba8966bd5269875add2a34806817c01a
-SIZE (go/devel_gitaly/gitaly-v18.6.1/gitlab-org-git-23466173824c0a0f835c0d790c2f38156ae6284a_GL0.tar.gz) = 11745131
-SHA256 (go/devel_gitaly/gitaly-v18.6.1/8309.patch) = 44a7f527e23f818b0c7080ac6f8a56b14f6711b3feca5dd1f59e39557a7e8bce
-SIZE (go/devel_gitaly/gitaly-v18.6.1/8309.patch) = 1287
+TIMESTAMP = 1765426153
+SHA256 (go/devel_gitaly/gitaly-v18.6.2/go.mod) = 1aace7ab09969668d9aad9416851833a2ec122442b060ce133e60d1d7c9b0252
+SIZE (go/devel_gitaly/gitaly-v18.6.2/go.mod) = 14044
+SHA256 (go/devel_gitaly/gitaly-v18.6.2/gitaly-v18.6.2.tar.bz2) = 856ccaefcd634fa08e9f801c6a0cfc80446b9d57ecd263bdc0f316650f3412cb
+SIZE (go/devel_gitaly/gitaly-v18.6.2/gitaly-v18.6.2.tar.bz2) = 4657307
+SHA256 (go/devel_gitaly/gitaly-v18.6.2/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4
+SIZE (go/devel_gitaly/gitaly-v18.6.2/git-v2.50.0.tar.bz2) = 9249878
+SHA256 (go/devel_gitaly/gitaly-v18.6.2/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = d3397b210ca156ed84ff69b3a7f6316c5026bd05d11455f23d8335473dceaf1b
+SIZE (go/devel_gitaly/gitaly-v18.6.2/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = 11822923
+SHA256 (go/devel_gitaly/gitaly-v18.6.2/gitlab-org-git-23466173824c0a0f835c0d790c2f38156ae6284a_GL0.tar.gz) = 01a4069b15e9262151b3b97f989d4939ba8966bd5269875add2a34806817c01a
+SIZE (go/devel_gitaly/gitaly-v18.6.2/gitlab-org-git-23466173824c0a0f835c0d790c2f38156ae6284a_GL0.tar.gz) = 11745131
+SHA256 (go/devel_gitaly/gitaly-v18.6.2/8309.patch) = 44a7f527e23f818b0c7080ac6f8a56b14f6711b3feca5dd1f59e39557a7e8bce
+SIZE (go/devel_gitaly/gitaly-v18.6.2/8309.patch) = 1287
diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo
index 9264b441b489..8cf7a86602da 100644
--- a/net/gitlab-agent/distinfo
+++ b/net/gitlab-agent/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1764220554
-SHA256 (go/net_gitlab-agent/gitlab-agent-v18.6.1/v18.6.1.mod) = 70aa1942f288770a76e933b4f648185d795b0ad148162c1bdf91c13c0c122526
-SIZE (go/net_gitlab-agent/gitlab-agent-v18.6.1/v18.6.1.mod) = 9944
-SHA256 (go/net_gitlab-agent/gitlab-agent-v18.6.1/v18.6.1.zip) = bd3e864462912f0b7f1807f03147b026ce967a505d9931ef52d9627008e9e233
-SIZE (go/net_gitlab-agent/gitlab-agent-v18.6.1/v18.6.1.zip) = 1917078
+TIMESTAMP = 1765426154
+SHA256 (go/net_gitlab-agent/gitlab-agent-v18.6.2/v18.6.2.mod) = 70aa1942f288770a76e933b4f648185d795b0ad148162c1bdf91c13c0c122526
+SIZE (go/net_gitlab-agent/gitlab-agent-v18.6.2/v18.6.2.mod) = 9944
+SHA256 (go/net_gitlab-agent/gitlab-agent-v18.6.2/v18.6.2.zip) = a500e7d7947660c1e5edfc44fef91295e747dad6a1868a2abd85da98db433388
+SIZE (go/net_gitlab-agent/gitlab-agent-v18.6.2/v18.6.2.zip) = 1917086
diff --git a/textproc/rubygem-gitlab-glfm-markdown/Makefile b/textproc/rubygem-gitlab-glfm-markdown/Makefile
index dc5639b48de9..9b069953f1b8 100644
--- a/textproc/rubygem-gitlab-glfm-markdown/Makefile
+++ b/textproc/rubygem-gitlab-glfm-markdown/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	gitlab-glfm-markdown
-PORTVERSION=	0.0.38
+PORTVERSION=	0.0.39
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Markdown processing for GitLab Flavored Markdown
 WWW=		https://gitlab.com/gitlab-org/ruby/gems/gitlab-glfm-markdown
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-rb_sys>=0.9.109<0.10:lang/rubygem-rb_sys
 
 USES=		cargo gem gmake llvm:build
 
 # Required to be able to build the rust library the gem uses
 GEMFILES:=	${DISTNAME}.gem
 DISTFILES+=	${DISTNAME}.gem
 GEMS_SKIP_SUBDIR=	1
-CARGO_VENDOR_DIR=	${WRKSRC}/ext/glfm_markdown/cargo-crates
-CARGO_CARGOTOML=	${WRKSRC}/ext/glfm_markdown/Cargo.toml
+CARGO_VENDOR_DIR=	${WRKSRC}/ext/gitlab_glfm_markdown/cargo-crates
+CARGO_CARGOTOML=	${WRKSRC}/ext/gitlab_glfm_markdown/Cargo.toml
 CARGO_BUILD=	no
 CARGO_INSTALL=	no
 GEM_ENV+=	MAKE=gmake
 
 # update the crates file with: make cargo-crates > Makefile.crates
 
 post-install:
-	@${ECHO_CMD} "${GEM_LIB_DIR}/ext/glfm_markdown/Cargo.lock" >> ${TMPPLIST}
+	@${ECHO_CMD} "${GEM_LIB_DIR}/ext/gitlab_glfm_markdown/Cargo.lock" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/textproc/rubygem-gitlab-glfm-markdown/Makefile.crates b/textproc/rubygem-gitlab-glfm-markdown/Makefile.crates
index 65ccdf9eef64..23d3c73268ef 100644
--- a/textproc/rubygem-gitlab-glfm-markdown/Makefile.crates
+++ b/textproc/rubygem-gitlab-glfm-markdown/Makefile.crates
@@ -1,121 +1,121 @@
 CARGO_CRATES=	adler2-2.0.1 \
 		aho-corasick-1.1.3 \
 		anstream-0.6.19 \
 		anstyle-1.0.11 \
 		anstyle-parse-0.2.7 \
 		anstyle-query-1.1.3 \
 		anstyle-wincon-3.0.9 \
 		base64-0.22.1 \
 		bincode-1.3.3 \
 		bindgen-0.69.5 \
 		bit-set-0.5.3 \
 		bit-vec-0.6.3 \
 		bitflags-1.3.2 \
 		bitflags-2.9.1 \
 		caseless-0.2.2 \
 		cc-1.2.27 \
 		cexpr-0.6.0 \
 		cfg-if-1.0.1 \
 		clang-sys-1.8.1 \
 		clap-4.4.18 \
 		clap_builder-4.4.18 \
 		clap_derive-4.4.7 \
 		clap_lex-0.6.0 \
 		colorchoice-1.0.4 \
-		comrak-0.46.0 \
+		comrak-0.48.0 \
 		crc32fast-1.4.2 \
 		deranged-0.4.0 \
 		either-1.15.0 \
 		emojis-0.6.4 \
 		entities-1.0.1 \
 		equivalent-1.0.2 \
 		fancy-regex-0.11.0 \
 		flate2-1.1.2 \
 		fnv-1.0.7 \
 		glob-0.3.2 \
 		hashbrown-0.15.4 \
 		heck-0.4.1 \
 		indexmap-2.10.0 \
 		is_terminal_polyfill-1.70.1 \
 		itertools-0.12.1 \
 		itoa-1.0.15 \
 		jetscii-0.5.3 \
 		lazy_static-1.5.0 \
 		lazycell-1.3.0 \
 		libc-0.2.174 \
 		libloading-0.8.8 \
 		linked-hash-map-0.5.6 \
 		magnus-0.8.2 \
 		magnus-macros-0.8.0 \
 		memchr-2.7.5 \
 		minimal-lexical-0.2.1 \
 		miniz_oxide-0.8.9 \
 		nom-7.1.3 \
 		num-conv-0.1.0 \
 		once_cell-1.21.3 \
 		once_cell_polyfill-1.70.1 \
 		onig-6.5.1 \
 		onig_sys-69.9.1 \
 		phf-0.11.3 \
 		phf_shared-0.11.3 \
 		pkg-config-0.3.32 \
 		plist-1.7.2 \
 		powerfmt-0.2.0 \
 		proc-macro2-1.0.95 \
 		quick-xml-0.37.5 \
 		quote-1.0.40 \
 		rb-sys-0.9.117 \
 		rb-sys-build-0.9.117 \
 		rb-sys-env-0.2.2 \
 		regex-1.11.1 \
 		regex-automata-0.4.9 \
 		regex-syntax-0.8.5 \
 		rustc-hash-1.1.0 \
 		ryu-1.0.20 \
 		same-file-1.0.6 \
 		seq-macro-0.3.6 \
 		serde-1.0.219 \
 		serde_derive-1.0.219 \
 		serde_json-1.0.140 \
 		serde_magnus-0.10.0 \
 		shell-words-1.1.0 \
 		shlex-1.3.0 \
 		siphasher-1.0.1 \
 		strsim-0.10.0 \
 		syn-2.0.104 \
 		syntect-5.2.0 \
 		tap-1.0.1 \
 		thiserror-1.0.69 \
 		thiserror-impl-1.0.69 \
 		time-0.3.41 \
 		time-core-0.1.4 \
 		time-macros-0.2.22 \
 		tinyvec-1.9.0 \
 		tinyvec_macros-0.1.1 \
 		typed-arena-2.0.2 \
 		unicode-ident-1.0.18 \
 		unicode-normalization-0.1.24 \
 		unicode_categories-0.1.1 \
 		utf8parse-0.2.2 \
 		walkdir-2.5.0 \
 		winapi-util-0.1.9 \
 		windows-sys-0.59.0 \
 		windows-targets-0.52.6 \
 		windows-targets-0.53.2 \
 		windows_aarch64_gnullvm-0.52.6 \
 		windows_aarch64_gnullvm-0.53.0 \
 		windows_aarch64_msvc-0.52.6 \
 		windows_aarch64_msvc-0.53.0 \
 		windows_i686_gnu-0.52.6 \
 		windows_i686_gnu-0.53.0 \
 		windows_i686_gnullvm-0.52.6 \
 		windows_i686_gnullvm-0.53.0 \
 		windows_i686_msvc-0.52.6 \
 		windows_i686_msvc-0.53.0 \
 		windows_x86_64_gnu-0.52.6 \
 		windows_x86_64_gnu-0.53.0 \
 		windows_x86_64_gnullvm-0.52.6 \
 		windows_x86_64_gnullvm-0.53.0 \
 		windows_x86_64_msvc-0.52.6 \
 		windows_x86_64_msvc-0.53.0 \
 		yaml-rust-0.4.5
diff --git a/textproc/rubygem-gitlab-glfm-markdown/distinfo b/textproc/rubygem-gitlab-glfm-markdown/distinfo
index 6a26dde63f6f..79743c2848b9 100644
--- a/textproc/rubygem-gitlab-glfm-markdown/distinfo
+++ b/textproc/rubygem-gitlab-glfm-markdown/distinfo
@@ -1,245 +1,245 @@
-TIMESTAMP = 1763010757
-SHA256 (gitlab-glfm-markdown-0.0.38.gem) = 8e57dd9283d655a40f6120dac0728f1d088900228977c139e3c969c756f40bc6
-SIZE (gitlab-glfm-markdown-0.0.38.gem) = 23040
+TIMESTAMP = 1765426185
+SHA256 (gitlab-glfm-markdown-0.0.39.gem) = a7d7d237203ebe290c2519b742c2c536ee94401a038ad63f043db9f4166fa0c7
+SIZE (gitlab-glfm-markdown-0.0.39.gem) = 23552
 SHA256 (rust/crates/adler2-2.0.1.crate) = 320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa
 SIZE (rust/crates/adler2-2.0.1.crate) = 13366
 SHA256 (rust/crates/aho-corasick-1.1.3.crate) = 8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916
 SIZE (rust/crates/aho-corasick-1.1.3.crate) = 183311
 SHA256 (rust/crates/anstream-0.6.19.crate) = 301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933
 SIZE (rust/crates/anstream-0.6.19.crate) = 28767
 SHA256 (rust/crates/anstyle-1.0.11.crate) = 862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd
 SIZE (rust/crates/anstyle-1.0.11.crate) = 15880
 SHA256 (rust/crates/anstyle-parse-0.2.7.crate) = 4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2
 SIZE (rust/crates/anstyle-parse-0.2.7.crate) = 21707
 SHA256 (rust/crates/anstyle-query-1.1.3.crate) = 6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9
 SIZE (rust/crates/anstyle-query-1.1.3.crate) = 10190
 SHA256 (rust/crates/anstyle-wincon-3.0.9.crate) = 403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882
 SIZE (rust/crates/anstyle-wincon-3.0.9.crate) = 12561
 SHA256 (rust/crates/base64-0.22.1.crate) = 72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6
 SIZE (rust/crates/base64-0.22.1.crate) = 81597
 SHA256 (rust/crates/bincode-1.3.3.crate) = b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad
 SIZE (rust/crates/bincode-1.3.3.crate) = 28958
 SHA256 (rust/crates/bindgen-0.69.5.crate) = 271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088
 SIZE (rust/crates/bindgen-0.69.5.crate) = 221128
 SHA256 (rust/crates/bit-set-0.5.3.crate) = 0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1
 SIZE (rust/crates/bit-set-0.5.3.crate) = 14470
 SHA256 (rust/crates/bit-vec-0.6.3.crate) = 349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb
 SIZE (rust/crates/bit-vec-0.6.3.crate) = 19927
 SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
 SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
 SHA256 (rust/crates/bitflags-2.9.1.crate) = 1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967
 SIZE (rust/crates/bitflags-2.9.1.crate) = 47913
 SHA256 (rust/crates/caseless-0.2.2.crate) = 8b6fd507454086c8edfd769ca6ada439193cdb209c7681712ef6275cccbfe5d8
 SIZE (rust/crates/caseless-0.2.2.crate) = 29309
 SHA256 (rust/crates/cc-1.2.27.crate) = d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc
 SIZE (rust/crates/cc-1.2.27.crate) = 107070
 SHA256 (rust/crates/cexpr-0.6.0.crate) = 6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766
 SIZE (rust/crates/cexpr-0.6.0.crate) = 17966
 SHA256 (rust/crates/cfg-if-1.0.1.crate) = 9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268
 SIZE (rust/crates/cfg-if-1.0.1.crate) = 8683
 SHA256 (rust/crates/clang-sys-1.8.1.crate) = 0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4
 SIZE (rust/crates/clang-sys-1.8.1.crate) = 44009
 SHA256 (rust/crates/clap-4.4.18.crate) = 1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c
 SIZE (rust/crates/clap-4.4.18.crate) = 55269
 SHA256 (rust/crates/clap_builder-4.4.18.crate) = 4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7
 SIZE (rust/crates/clap_builder-4.4.18.crate) = 163538
 SHA256 (rust/crates/clap_derive-4.4.7.crate) = cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442
 SIZE (rust/crates/clap_derive-4.4.7.crate) = 29046
 SHA256 (rust/crates/clap_lex-0.6.0.crate) = 702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1
 SIZE (rust/crates/clap_lex-0.6.0.crate) = 12272
 SHA256 (rust/crates/colorchoice-1.0.4.crate) = b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75
 SIZE (rust/crates/colorchoice-1.0.4.crate) = 8196
-SHA256 (rust/crates/comrak-0.46.0.crate) = dc151d9c800c4fadd542c949b84c1dae6d1b424315ebcfd154e611d4f7910a97
-SIZE (rust/crates/comrak-0.46.0.crate) = 223946
+SHA256 (rust/crates/comrak-0.48.0.crate) = 48bf2260aceee247c6c5639f5751dc635211895066d782d2a28fb87f2e0d5613
+SIZE (rust/crates/comrak-0.48.0.crate) = 227493
 SHA256 (rust/crates/crc32fast-1.4.2.crate) = a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3
 SIZE (rust/crates/crc32fast-1.4.2.crate) = 38491
 SHA256 (rust/crates/deranged-0.4.0.crate) = 9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e
 SIZE (rust/crates/deranged-0.4.0.crate) = 23235
 SHA256 (rust/crates/either-1.15.0.crate) = 48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719
 SIZE (rust/crates/either-1.15.0.crate) = 20114
 SHA256 (rust/crates/emojis-0.6.4.crate) = 99e1f1df1f181f2539bac8bf027d31ca5ffbf9e559e3f2d09413b9107b5c02f4
 SIZE (rust/crates/emojis-0.6.4.crate) = 120190
 SHA256 (rust/crates/entities-1.0.1.crate) = b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca
 SIZE (rust/crates/entities-1.0.1.crate) = 24795
 SHA256 (rust/crates/equivalent-1.0.2.crate) = 877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f
 SIZE (rust/crates/equivalent-1.0.2.crate) = 7419
 SHA256 (rust/crates/fancy-regex-0.11.0.crate) = b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2
 SIZE (rust/crates/fancy-regex-0.11.0.crate) = 82918
 SHA256 (rust/crates/flate2-1.1.2.crate) = 4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d
 SIZE (rust/crates/flate2-1.1.2.crate) = 76495
 SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1
 SIZE (rust/crates/fnv-1.0.7.crate) = 11266
 SHA256 (rust/crates/glob-0.3.2.crate) = a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2
 SIZE (rust/crates/glob-0.3.2.crate) = 22359
 SHA256 (rust/crates/hashbrown-0.15.4.crate) = 5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5
 SIZE (rust/crates/hashbrown-0.15.4.crate) = 140447
 SHA256 (rust/crates/heck-0.4.1.crate) = 95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8
 SIZE (rust/crates/heck-0.4.1.crate) = 11567
 SHA256 (rust/crates/indexmap-2.10.0.crate) = fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661
 SIZE (rust/crates/indexmap-2.10.0.crate) = 95836
 SHA256 (rust/crates/is_terminal_polyfill-1.70.1.crate) = 7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf
 SIZE (rust/crates/is_terminal_polyfill-1.70.1.crate) = 7492
 SHA256 (rust/crates/itertools-0.12.1.crate) = ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569
 SIZE (rust/crates/itertools-0.12.1.crate) = 137761
 SHA256 (rust/crates/itoa-1.0.15.crate) = 4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c
 SIZE (rust/crates/itoa-1.0.15.crate) = 11231
 SHA256 (rust/crates/jetscii-0.5.3.crate) = 47f142fe24a9c9944451e8349de0a56af5f3e7226dc46f3ed4d4ecc0b85af75e
 SIZE (rust/crates/jetscii-0.5.3.crate) = 18811
 SHA256 (rust/crates/lazy_static-1.5.0.crate) = bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe
 SIZE (rust/crates/lazy_static-1.5.0.crate) = 14025
 SHA256 (rust/crates/lazycell-1.3.0.crate) = 830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55
 SIZE (rust/crates/lazycell-1.3.0.crate) = 12502
 SHA256 (rust/crates/libc-0.2.174.crate) = 1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776
 SIZE (rust/crates/libc-0.2.174.crate) = 779933
 SHA256 (rust/crates/libloading-0.8.8.crate) = 07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667
 SIZE (rust/crates/libloading-0.8.8.crate) = 31345
 SHA256 (rust/crates/linked-hash-map-0.5.6.crate) = 0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f
 SIZE (rust/crates/linked-hash-map-0.5.6.crate) = 15049
 SHA256 (rust/crates/magnus-0.8.2.crate) = 3b36a5b126bbe97eb0d02d07acfeb327036c6319fd816139a49824a83b7f9012
 SIZE (rust/crates/magnus-0.8.2.crate) = 199864
 SHA256 (rust/crates/magnus-macros-0.8.0.crate) = 47607461fd8e1513cb4f2076c197d8092d921a1ea75bd08af97398f593751892
 SIZE (rust/crates/magnus-macros-0.8.0.crate) = 8146
 SHA256 (rust/crates/memchr-2.7.5.crate) = 32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0
 SIZE (rust/crates/memchr-2.7.5.crate) = 97603
 SHA256 (rust/crates/minimal-lexical-0.2.1.crate) = 68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a
 SIZE (rust/crates/minimal-lexical-0.2.1.crate) = 94841
 SHA256 (rust/crates/miniz_oxide-0.8.9.crate) = 1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316
 SIZE (rust/crates/miniz_oxide-0.8.9.crate) = 67132
 SHA256 (rust/crates/nom-7.1.3.crate) = d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a
 SIZE (rust/crates/nom-7.1.3.crate) = 117570
 SHA256 (rust/crates/num-conv-0.1.0.crate) = 51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9
 SIZE (rust/crates/num-conv-0.1.0.crate) = 7444
 SHA256 (rust/crates/once_cell-1.21.3.crate) = 42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d
 SIZE (rust/crates/once_cell-1.21.3.crate) = 34534
 SHA256 (rust/crates/once_cell_polyfill-1.70.1.crate) = a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad
 SIZE (rust/crates/once_cell_polyfill-1.70.1.crate) = 7510
 SHA256 (rust/crates/onig-6.5.1.crate) = 336b9c63443aceef14bea841b899035ae3abe89b7c486aaf4c5bd8aafedac3f0
 SIZE (rust/crates/onig-6.5.1.crate) = 32394
 SHA256 (rust/crates/onig_sys-69.9.1.crate) = c7f86c6eef3d6df15f23bcfb6af487cbd2fed4e5581d58d5bf1f5f8b7f6727dc
 SIZE (rust/crates/onig_sys-69.9.1.crate) = 656378
 SHA256 (rust/crates/phf-0.11.3.crate) = 1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078
 SIZE (rust/crates/phf-0.11.3.crate) = 23231
 SHA256 (rust/crates/phf_shared-0.11.3.crate) = 67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5
 SIZE (rust/crates/phf_shared-0.11.3.crate) = 15199
 SHA256 (rust/crates/pkg-config-0.3.32.crate) = 7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c
 SIZE (rust/crates/pkg-config-0.3.32.crate) = 21370
 SHA256 (rust/crates/plist-1.7.2.crate) = 3d77244ce2d584cd84f6a15f86195b8c9b2a0dfbfd817c09e0464244091a58ed
 SIZE (rust/crates/plist-1.7.2.crate) = 102909
 SHA256 (rust/crates/powerfmt-0.2.0.crate) = 439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391
 SIZE (rust/crates/powerfmt-0.2.0.crate) = 15165
 SHA256 (rust/crates/proc-macro2-1.0.95.crate) = 02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778
 SIZE (rust/crates/proc-macro2-1.0.95.crate) = 51820
 SHA256 (rust/crates/quick-xml-0.37.5.crate) = 331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb
 SIZE (rust/crates/quick-xml-0.37.5.crate) = 190481
 SHA256 (rust/crates/quote-1.0.40.crate) = 1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d
 SIZE (rust/crates/quote-1.0.40.crate) = 31063
 SHA256 (rust/crates/rb-sys-0.9.117.crate) = f900d1ce4629a2ebffaf5de74bd8f9c1188d4c5ed406df02f97e22f77a006f44
 SIZE (rust/crates/rb-sys-0.9.117.crate) = 28664
 SHA256 (rust/crates/rb-sys-build-0.9.117.crate) = ef1e9c857028f631056bcd6d88cec390c751e343ce2223ddb26d23eb4a151d59
 SIZE (rust/crates/rb-sys-build-0.9.117.crate) = 24740
 SHA256 (rust/crates/rb-sys-env-0.2.2.crate) = 08f8d2924cf136a1315e2b4c7460a39f62ef11ee5d522df9b2750fab55b868b6
 SIZE (rust/crates/rb-sys-env-0.2.2.crate) = 9195
 SHA256 (rust/crates/regex-1.11.1.crate) = b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191
 SIZE (rust/crates/regex-1.11.1.crate) = 254170
 SHA256 (rust/crates/regex-automata-0.4.9.crate) = 809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908
 SIZE (rust/crates/regex-automata-0.4.9.crate) = 618525
 SHA256 (rust/crates/regex-syntax-0.8.5.crate) = 2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c
 SIZE (rust/crates/regex-syntax-0.8.5.crate) = 357541
 SHA256 (rust/crates/rustc-hash-1.1.0.crate) = 08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2
 SIZE (rust/crates/rustc-hash-1.1.0.crate) = 9331
 SHA256 (rust/crates/ryu-1.0.20.crate) = 28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f
 SIZE (rust/crates/ryu-1.0.20.crate) = 48738
 SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502
 SIZE (rust/crates/same-file-1.0.6.crate) = 10183
 SHA256 (rust/crates/seq-macro-0.3.6.crate) = 1bc711410fbe7399f390ca1c3b60ad0f53f80e95c5eb935e52268a0e2cd49acc
 SIZE (rust/crates/seq-macro-0.3.6.crate) = 16031
 SHA256 (rust/crates/serde-1.0.219.crate) = 5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6
 SIZE (rust/crates/serde-1.0.219.crate) = 78983
 SHA256 (rust/crates/serde_derive-1.0.219.crate) = 5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00
 SIZE (rust/crates/serde_derive-1.0.219.crate) = 57798
 SHA256 (rust/crates/serde_json-1.0.140.crate) = 20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373
 SIZE (rust/crates/serde_json-1.0.140.crate) = 154852
 SHA256 (rust/crates/serde_magnus-0.10.0.crate) = c4a5121544138e6a14036e48ecbe589fb63577f35620caaa32642257b412c317
 SIZE (rust/crates/serde_magnus-0.10.0.crate) = 16391
 SHA256 (rust/crates/shell-words-1.1.0.crate) = 24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde
 SIZE (rust/crates/shell-words-1.1.0.crate) = 9871
 SHA256 (rust/crates/shlex-1.3.0.crate) = 0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64
 SIZE (rust/crates/shlex-1.3.0.crate) = 18713
 SHA256 (rust/crates/siphasher-1.0.1.crate) = 56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d
 SIZE (rust/crates/siphasher-1.0.1.crate) = 10351
 SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623
 SIZE (rust/crates/strsim-0.10.0.crate) = 11355
 SHA256 (rust/crates/syn-2.0.104.crate) = 17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40
 SIZE (rust/crates/syn-2.0.104.crate) = 299699
 SHA256 (rust/crates/syntect-5.2.0.crate) = 874dcfa363995604333cf947ae9f751ca3af4522c60886774c4963943b4746b1
 SIZE (rust/crates/syntect-5.2.0.crate) = 822671
 SHA256 (rust/crates/tap-1.0.1.crate) = 55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369
 SIZE (rust/crates/tap-1.0.1.crate) = 11316
 SHA256 (rust/crates/thiserror-1.0.69.crate) = b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52
 SIZE (rust/crates/thiserror-1.0.69.crate) = 22198
 SHA256 (rust/crates/thiserror-impl-1.0.69.crate) = 4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1
 SIZE (rust/crates/thiserror-impl-1.0.69.crate) = 18365
 SHA256 (rust/crates/time-0.3.41.crate) = 8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40
 SIZE (rust/crates/time-0.3.41.crate) = 138369
 SHA256 (rust/crates/time-core-0.1.4.crate) = c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c
 SIZE (rust/crates/time-core-0.1.4.crate) = 8422
 SHA256 (rust/crates/time-macros-0.2.22.crate) = 3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49
 SIZE (rust/crates/time-macros-0.2.22.crate) = 24604
 SHA256 (rust/crates/tinyvec-1.9.0.crate) = 09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71
 SIZE (rust/crates/tinyvec-1.9.0.crate) = 54137
 SHA256 (rust/crates/tinyvec_macros-0.1.1.crate) = 1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20
 SIZE (rust/crates/tinyvec_macros-0.1.1.crate) = 5865
 SHA256 (rust/crates/typed-arena-2.0.2.crate) = 6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a
 SIZE (rust/crates/typed-arena-2.0.2.crate) = 11848
 SHA256 (rust/crates/unicode-ident-1.0.18.crate) = 5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512
 SIZE (rust/crates/unicode-ident-1.0.18.crate) = 47743
 SHA256 (rust/crates/unicode-normalization-0.1.24.crate) = 5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956
 SIZE (rust/crates/unicode-normalization-0.1.24.crate) = 126536
 SHA256 (rust/crates/unicode_categories-0.1.1.crate) = 39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e
 SIZE (rust/crates/unicode_categories-0.1.1.crate) = 87298
 SHA256 (rust/crates/utf8parse-0.2.2.crate) = 06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821
 SIZE (rust/crates/utf8parse-0.2.2.crate) = 13499
 SHA256 (rust/crates/walkdir-2.5.0.crate) = 29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b
 SIZE (rust/crates/walkdir-2.5.0.crate) = 23951
 SHA256 (rust/crates/winapi-util-0.1.9.crate) = cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb
 SIZE (rust/crates/winapi-util-0.1.9.crate) = 12464
 SHA256 (rust/crates/windows-sys-0.59.0.crate) = 1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b
 SIZE (rust/crates/windows-sys-0.59.0.crate) = 2387323
 SHA256 (rust/crates/windows-targets-0.52.6.crate) = 9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973
 SIZE (rust/crates/windows-targets-0.52.6.crate) = 6403
 SHA256 (rust/crates/windows-targets-0.53.2.crate) = c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef
 SIZE (rust/crates/windows-targets-0.53.2.crate) = 7046
 SHA256 (rust/crates/windows_aarch64_gnullvm-0.52.6.crate) = 32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3
 SIZE (rust/crates/windows_aarch64_gnullvm-0.52.6.crate) = 435718
 SHA256 (rust/crates/windows_aarch64_gnullvm-0.53.0.crate) = 86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764
 SIZE (rust/crates/windows_aarch64_gnullvm-0.53.0.crate) = 782443
 SHA256 (rust/crates/windows_aarch64_msvc-0.52.6.crate) = 09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469
 SIZE (rust/crates/windows_aarch64_msvc-0.52.6.crate) = 832615
 SHA256 (rust/crates/windows_aarch64_msvc-0.53.0.crate) = c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c
 SIZE (rust/crates/windows_aarch64_msvc-0.53.0.crate) = 834446
 SHA256 (rust/crates/windows_i686_gnu-0.52.6.crate) = 8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b
 SIZE (rust/crates/windows_i686_gnu-0.52.6.crate) = 880402
 SHA256 (rust/crates/windows_i686_gnu-0.53.0.crate) = c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3
 SIZE (rust/crates/windows_i686_gnu-0.53.0.crate) = 936973
 SHA256 (rust/crates/windows_i686_gnullvm-0.52.6.crate) = 0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66
 SIZE (rust/crates/windows_i686_gnullvm-0.52.6.crate) = 475940
 SHA256 (rust/crates/windows_i686_gnullvm-0.53.0.crate) = 9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11
 SIZE (rust/crates/windows_i686_gnullvm-0.53.0.crate) = 854056
 SHA256 (rust/crates/windows_i686_msvc-0.52.6.crate) = 240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66
 SIZE (rust/crates/windows_i686_msvc-0.52.6.crate) = 901163
 SHA256 (rust/crates/windows_i686_msvc-0.53.0.crate) = 581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d
 SIZE (rust/crates/windows_i686_msvc-0.53.0.crate) = 903450
 SHA256 (rust/crates/windows_x86_64_gnu-0.52.6.crate) = 147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78
 SIZE (rust/crates/windows_x86_64_gnu-0.52.6.crate) = 836363
 SHA256 (rust/crates/windows_x86_64_gnu-0.53.0.crate) = 2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba
 SIZE (rust/crates/windows_x86_64_gnu-0.53.0.crate) = 902585
 SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.6.crate) = 24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d
 SIZE (rust/crates/windows_x86_64_gnullvm-0.52.6.crate) = 435707
 SHA256 (rust/crates/windows_x86_64_gnullvm-0.53.0.crate) = 0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57
 SIZE (rust/crates/windows_x86_64_gnullvm-0.53.0.crate) = 782434
 SHA256 (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec
 SIZE (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 832564
 SHA256 (rust/crates/windows_x86_64_msvc-0.53.0.crate) = 271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486
 SIZE (rust/crates/windows_x86_64_msvc-0.53.0.crate) = 834400
 SHA256 (rust/crates/yaml-rust-0.4.5.crate) = 56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85
 SIZE (rust/crates/yaml-rust-0.4.5.crate) = 47783
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index 6b4d712631f2..cbd198b7fcea 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1764220556
-SHA256 (go/www_gitlab-pages/gitlab-pages-v18.6.1/go.mod) = 01a4fafec3c597505de06cc4dc76a706e78e461b21562113750dfec75e9458c2
-SIZE (go/www_gitlab-pages/gitlab-pages-v18.6.1/go.mod) = 3416
-SHA256 (go/www_gitlab-pages/gitlab-pages-v18.6.1/gitlab-pages-v18.6.1.tar.bz2) = 8c4823f800fa497ed170035bdd384b4ccece0c2ece38d2bc8c54b45243268e25
-SIZE (go/www_gitlab-pages/gitlab-pages-v18.6.1/gitlab-pages-v18.6.1.tar.bz2) = 237391
+TIMESTAMP = 1765426161
+SHA256 (go/www_gitlab-pages/gitlab-pages-v18.6.2/go.mod) = 01a4fafec3c597505de06cc4dc76a706e78e461b21562113750dfec75e9458c2
+SIZE (go/www_gitlab-pages/gitlab-pages-v18.6.2/go.mod) = 3416
+SHA256 (go/www_gitlab-pages/gitlab-pages-v18.6.2/gitlab-pages-v18.6.2.tar.bz2) = c639c05bd79199fbd93cc2a9385c33cff461581aca20cdba3ff2b89a49879b7f
+SIZE (go/www_gitlab-pages/gitlab-pages-v18.6.2/gitlab-pages-v18.6.2.tar.bz2) = 237023
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index 82201c1779fd..276c884ff68b 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1764220573
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.6.1/go.mod) = 11c339bb0fbbc0ad18e7e636a2f3cd686ea3425805f0ed0db5f629008a1d6952
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.6.1/go.mod) = 9356
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.6.1/gitlab-foss-v18.6.1.tar.bz2) = d85d6d824089cc12016fa8d3a5037cd254dff3c1e8ad477e6a1153851161e1a0
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.6.1/gitlab-foss-v18.6.1.tar.bz2) = 126836032
+TIMESTAMP = 1765426180
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.6.2/go.mod) = 11c339bb0fbbc0ad18e7e636a2f3cd686ea3425805f0ed0db5f629008a1d6952
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.6.2/go.mod) = 9356
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.6.2/gitlab-foss-v18.6.2.tar.bz2) = 6e0ee01b940be896e256ced4d312967101e489556a9ac30d3c413a8986272c4e
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.6.2/gitlab-foss-v18.6.2.tar.bz2) = 126869309
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index c9e7ffa48d7d..cfae0e2d3a9c 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -1,584 +1,584 @@
 PORTNAME=	gitlab-${FLAVOR:Uce}
 PORTVERSION=	${GITLAB_VERSION}
 DISTVERSIONPREFIX=	v
 .if ${FLAVOR:U} == ee
 DISTVERSIONSUFFIX=	-ee
 .endif
 PORTREVISION=	${GITLAB_PORTREVISION} # modify it in www/gitlab/Makefile.common
 CATEGORIES=	www devel
 
 # include patch to fix database migration
 #https://gitlab.com/gitlab-org/gitlab/-/merge_requests/153560.patch
 #PATCH_SITES=	https://gitlab.com/gitlab-org/gitlab/-/merge_requests/
 #PATCHFILES+=	153560.patch:-p1 # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/153560
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Web GUI for managing git repositories
 WWW=		https://gitlab.com/ \
 		https://gitlab.com/gitlab-org/gitlab
 
 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
 #gitlab-zoekt-indexer>=0.16.0:textproc/gitlab-zoekt-indexer
 MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	gitlab-elasticsearch-indexer>=5.10.1:textproc/gitlab-elasticsearch-indexer \
 	gitlab-agent>=${GITLAB_VERSION}:net/gitlab-agent \
 	gitlab-pages>=${GITLAB_VERSION}:www/gitlab-pages \
 	gitlab-shell>=14.45.3:devel/gitlab-shell \
 	gitlab-workhorse>=${GITLAB_VERSION}:www/gitlab-workhorse \
 	gitlab-zoekt-indexer>=1.7.6:textproc/gitlab-zoekt-indexer \
 	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-parser>=3.3.10.0:devel/rubygem-parser \
 	rubygem-net-smtp>=0:mail/rubygem-net-smtp \
 	rubygem-psych3>=3.1<4:textproc/rubygem-psych3 \
 	rubygem-net-pop>=0:mail/rubygem-net-pop \
 	rubygem-rails-gitlab>=${RAILS_VERSION}<7.2:www/rubygem-rails-gitlab \
 	rubygem-zeitwerk>=2.6.18<2.6.19:devel/rubygem-zeitwerk \
 	rubygem-mutex_m>=0.3<1:devel/rubygem-mutex_m \
 	rubygem-drb-gitlab>=2.2.3<3:devel/rubygem-drb-gitlab \
 	rubygem-bootsnap-gitlab>=1.18.6<1.19:devel/rubygem-bootsnap-gitlab \
 	rubygem-ffi>=1.17.2<2:devel/rubygem-ffi \
 	rubygem-openssl>=3.3.2<3.4:security/rubygem-openssl \
 	rubygem-gitlab-secret_detection>=0.38.0<1:security/rubygem-gitlab-secret_detection \
 	rubygem-responders-rails-gitlab>=3.0<4.0:www/rubygem-responders-rails-gitlab \
 	rubygem-sprockets-gitlab>=3.7.5<3.8:devel/rubygem-sprockets-gitlab \
 	rubygem-sprockets-rails-rails-gitlab>=3.5.2<3.6:devel/rubygem-sprockets-rails-rails-gitlab \
 	rubygem-view_component-rails-gitlab>=3.23.2<3.24:devel/rubygem-view_component-rails-gitlab \
 	rubygem-pg-gitlab>=1.6.1<1.7:databases/rubygem-pg-gitlab \
 	rubygem-rugged>=1.6<2:devel/rubygem-rugged \
 	rubygem-faraday-gitlab>=2.13.4<3:www/rubygem-faraday-gitlab \
 	rubygem-faraday-retry-gitlab>=2<3:www/rubygem-faraday-retry-gitlab \
 	rubygem-logger-gitlab>=1.7.0<1.8:devel/rubygem-logger-gitlab \
 	rubygem-marginalia>=1.11.1<1.12:databases/rubygem-marginalia \
 	rubygem-declarative_policy>=2.0.1<2.1:security/rubygem-declarative_policy \
 	rubygem-coverband>=6.1.5<6.1.6:www/rubygem-coverband \
 	rubygem-devise-rails-gitlab>=4.9.3<4.10:devel/rubygem-devise-rails-gitlab \
 	rubygem-bcrypt>=3.1.20<3.2:security/rubygem-bcrypt \
 	rubygem-doorkeeper-rails-gitlab>=5.8.1<6:security/rubygem-doorkeeper-rails-gitlab \
 	rubygem-doorkeeper-openid_connect>=1.8.11<2:security/rubygem-doorkeeper-openid_connect \
 	rubygem-doorkeeper-device_authorization_grant>=1.0.0<1.1:security/rubygem-doorkeeper-device_authorization_grant \
 	rubygem-rexml>=3.4.4<3.5:textproc/rubygem-rexml \
 	rubygem-ruby-saml-gitlab>=1.18.1<2:security/rubygem-ruby-saml-gitlab \
 	rubygem-omniauth-saml-gitlab>=2.2.4<3:security/rubygem-omniauth-saml-gitlab \
 	rubygem-omniauth-gl>=2.1.3<3:security/rubygem-omniauth-gl \
 	rubygem-omniauth-auth0-gitlab>=3.1.1<3.2.0:net/rubygem-omniauth-auth0-gitlab \
 	rubygem-omniauth-azure-activedirectory-v2>=2.0<3:net/rubygem-omniauth-azure-activedirectory-v2 \
 	rubygem-omniauth-alicloud>=3.0.0<3.1:security/rubygem-omniauth-alicloud \
 	rubygem-omniauth-github-gitlab>=2.0.1<2.1:net/rubygem-omniauth-github-gitlab \
 	rubygem-omniauth-google-oauth2-gitlab>=1.2.1<2:net/rubygem-omniauth-google-oauth2-gitlab \
 	rubygem-omniauth-oauth2-generic-gitlab>=0.2.2<0.3.0:security/rubygem-omniauth-oauth2-generic-gitlab \
 	rubygem-omniauth-shibboleth-redux-gitlab>=2.0<3:security/rubygem-omniauth-shibboleth-redux-gitlab \
 	rubygem-omniauth_openid_connect>=0.8.0<0.9:net/rubygem-omniauth_openid_connect \
 	rubygem-openid_connect>=2.3.1<2.4:net/rubygem-openid_connect \
 	rubygem-omniauth-atlassian-oauth2>=0.2.0<0.3:security/rubygem-omniauth-atlassian-oauth2 \
 	rubygem-rack-oauth2-gitlab>=2.2.1<2.3:security/rubygem-rack-oauth2-gitlab \
 	rubygem-jwt2>=2.10.2<2.11:www/rubygem-jwt2 \
 	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.3.0<2.4:graphics/rubygem-invisible_captcha \
 	rubygem-devise-two-factor-rails-gitlab>=4.1.1<4.2:security/rubygem-devise-two-factor-rails-gitlab \
 	rubygem-rqrcode-gitlab>=2.2.0<3:www/rubygem-rqrcode-gitlab \
 	rubygem-attr_encrypted>=4.2<5:security/rubygem-attr_encrypted \
 	rubygem-validates_hostname-gitlab>=1.0.13<1.1.0:dns/rubygem-validates_hostname-gitlab \
 	rubygem-rubyzip-gitlab>=2.4.1<2.5:archivers/rubygem-rubyzip-gitlab \
 	rubygem-acme-client-gitlab>=2.0.26<3:security/rubygem-acme-client-gitlab \
 	rubygem-browser5>=5.3.1<5.4:www/rubygem-browser5 \
 	rubygem-ohai>=18.1.18<19:sysutils/rubygem-ohai \
 	rubygem-gpgme>=2.0.25<2.1.0:security/rubygem-gpgme \
 	rubygem-gitlab_omniauth-ldap-gitlab>=2.3.0<2.4.0:net/rubygem-gitlab_omniauth-ldap-gitlab \
 	rubygem-net-ldap017>=0.17.1<0.18:net/rubygem-net-ldap017 \
 	rubygem-grape20>=2.0.0<2.1:devel/rubygem-grape20 \
 	rubygem-grape-entity>=1.0.1<1.1,1:devel/rubygem-grape-entity \
 	rubygem-grape-swagger-gitlab>=2.1.2<2.2:devel/rubygem-grape-swagger-gitlab \
 	rubygem-grape-swagger-entity>=0.5.5<0.6:devel/rubygem-grape-swagger-entity \
 	rubygem-grape-path-helpers>=2.0.1<2.1:devel/rubygem-grape-path-helpers \
 	rubygem-rack-cors>=2.0.1<2.1:www/rubygem-rack-cors \
 	rubygem-graphql>=2.5.11<2.6:devel/rubygem-graphql \
 	rubygem-apollo_upload_server>=2.1.6<2.2:net/rubygem-apollo_upload_server \
 	rubygem-ffaker>=2.25.0<3:devel/rubygem-ffaker \
 	rubygem-hashie>=5.0.0<5.1:devel/rubygem-hashie \
 	rubygem-kaminari-rails-gitlab>=1.2.2<1.3:www/rubygem-kaminari-rails-gitlab \
 	rubygem-hamlit>=3.0.3<3.1:www/rubygem-hamlit \
 	rubygem-carrierwave-gitlab>=1.3.4<2.0:www/rubygem-carrierwave-gitlab \
 	rubygem-mini_magick4>=4.12<5:graphics/rubygem-mini_magick4 \
 	rubygem-marcel-gitlab>=1.0.4<1.1:devel/rubygem-marcel-gitlab \
 	rubygem-prawn>=0:print/rubygem-prawn \
 	rubygem-prawn-svg>=0:print/rubygem-prawn-svg \
 	rubygem-fog-aws-gitlab>=3.28.0<4:net/rubygem-fog-aws-gitlab \
 	rubygem-fog-core-gitlab>=2.5<3:devel/rubygem-fog-core-gitlab \
 	rubygem-fog-google-gitlab>=1.25.0<2:net/rubygem-fog-google-gitlab \
 	rubygem-fog-local-gitlab>=0.8<1.0:net/rubygem-fog-local-gitlab \
 	rubygem-fog-aliyun-gitlab>=0.4<1.0:net/rubygem-fog-aliyun-gitlab \
 	rubygem-gitlab-fog-azure-rm>=2.4.0<2.5:net/rubygem-gitlab-fog-azure-rm \
 	rubygem-google-apis-storage_v1-gitlab>=0.29<1:devel/rubygem-google-apis-storage_v1-gitlab \
 	rubygem-google-cloud-storage-gitlab>=1.57.0<1.58:net/rubygem-google-cloud-storage-gitlab \
 	rubygem-google-apis-core-gitlab>=0.18.0<0.19:devel/rubygem-google-apis-core-gitlab \
 	rubygem-google-apis-compute_v1-gitlab>=0.129.0<0.130:devel/rubygem-google-apis-compute_v1-gitlab \
 	rubygem-google-apis-container_v1>=0.100.0<0.101:devel/rubygem-google-apis-container_v1 \
 	rubygem-google-apis-container_v1beta1>=0.91.0<0.92:devel/rubygem-google-apis-container_v1beta1 \
 	rubygem-google-apis-cloudbilling_v1>=0.22.0<0.23:devel/rubygem-google-apis-cloudbilling_v1 \
 	rubygem-google-apis-cloudresourcemanager_v1-gitlab>=0.44.0<0.45:devel/rubygem-google-apis-cloudresourcemanager_v1-gitlab \
 	rubygem-google-apis-iam_v1-gitlab>=0.79.0<0.80:devel/rubygem-google-apis-iam_v1-gitlab \
 	rubygem-google-apis-serviceusage_v1>=0.28.0<0.29:devel/rubygem-google-apis-serviceusage_v1 \
 	rubygem-google-apis-sqladmin_v1beta4-gitlab>=0.41.0<0.42:devel/rubygem-google-apis-sqladmin_v1beta4-gitlab \
 	rubygem-google-apis-androidpublisher_v3-gitlab>=0.86.0<0.87:devel/rubygem-google-apis-androidpublisher_v3-gitlab \
 	rubygem-googleauth-gitlab>=1.14<2:security/rubygem-googleauth-gitlab \
 	rubygem-google-cloud-artifact_registry-v1>=0.11.0<0.12:textproc/rubygem-google-cloud-artifact_registry-v1 \
 	rubygem-google-cloud-compute-v1>=2.6.0<2.7:net/rubygem-google-cloud-compute-v1 \
 	rubygem-seed-fu-gitlab>=2.3.9<2.4.0:databases/rubygem-seed-fu-gitlab \
 	rubygem-elasticsearch-model-gitlab>=7.2<8:textproc/rubygem-elasticsearch-model-gitlab \
 	rubygem-elasticsearch-rails7>=7.2<8:textproc/rubygem-elasticsearch-rails7 \
 	rubygem-elasticsearch-api-gitlab>=7.17.11<7.18:textproc/rubygem-elasticsearch-api-gitlab \
 	rubygem-aws-sdk-core-gitlab>=3.226.3<3.227:devel/rubygem-aws-sdk-core-gitlab \
 	rubygem-aws-sdk-cloudformation-gitlab>=1.134<2:devel/rubygem-aws-sdk-cloudformation-gitlab \
 	rubygem-aws-sdk-s3-gitlab>=1.193.0<1.194:devel/rubygem-aws-sdk-s3-gitlab \
 	rubygem-faraday-typhoeus-gitlab>=1.1<2:www/rubygem-faraday-typhoeus-gitlab \
 	rubygem-faraday_middleware-aws-sigv4-gitlab>=1.0.1<1.1:devel/rubygem-faraday_middleware-aws-sigv4-gitlab \
 	rubygem-typhoeus-gitlab>=1.4.0<1.5:www/rubygem-typhoeus-gitlab \
 	rubygem-html-pipeline-gitlab>=2.14.3<2.15:textproc/rubygem-html-pipeline-gitlab \
 	rubygem-deckar01-task_list-gitlab>=2.3.4<2.4:www/rubygem-deckar01-task_list-gitlab \
 	rubygem-gitlab-markup>=2.0.0<2.1:textproc/rubygem-gitlab-markup \
 	rubygem-commonmarker0>=0.23.12<0.24:textproc/rubygem-commonmarker0 \
 	rubygem-kramdown-gitlab>=2.5.1<2.6:textproc/rubygem-kramdown-gitlab \
 	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 \
 	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.10.0<0.11:textproc/rubygem-asciidoctor-kroki \
 	rubygem-rouge-gitlab>=4.6.1<4.7:textproc/rubygem-rouge-gitlab \
 	rubygem-truncato>=0.7.13<0.8.0:textproc/rubygem-truncato \
 	rubygem-nokogiri>=1.18.10<2:textproc/rubygem-nokogiri \
-	rubygem-gitlab-glfm-markdown>=0.0.38<0.1:textproc/rubygem-gitlab-glfm-markdown \
+	rubygem-gitlab-glfm-markdown>=0.0.39<0.1:textproc/rubygem-gitlab-glfm-markdown \
 	rubygem-tanuki_emoji>=0.13<1:graphics/rubygem-tanuki_emoji \
 	rubygem-unicode-emoji>=4.0.4<5:devel/rubygem-unicode-emoji \
 	rubygem-icalendar-gitlab>=2.10.3<2.11:devel/rubygem-icalendar-gitlab \
 	rubygem-diffy>=3.4.4<4:textproc/rubygem-diffy \
 	rubygem-rack22>=2.2.20,3<2.3,3:www/rubygem-rack22 \
 	rubygem-rack-timeout>=0.7.0<0.8:www/rubygem-rack-timeout \
 	rubygem-puma-gitlab>=6.6.1<6.6.2:www/rubygem-puma-gitlab \
 	rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \
 	rubygem-state_machines-activerecord-gitlab>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord-gitlab \
 	rubygem-sidekiq-gitlab>=7.3.9:devel/rubygem-sidekiq-gitlab \
 	rubygem-sidekiq-cron-rails-gitlab>=1.12.0<1.13:devel/rubygem-sidekiq-cron-rails-gitlab \
 	rubygem-fugit-gitlab>=1.11.2<1.12:devel/rubygem-fugit-gitlab \
 	rubygem-httparty-gitlab>=0.23.0<0.24:www/rubygem-httparty-gitlab \
 	rubygem-rainbow>=3.1.1<4.0:devel/rubygem-rainbow \
 	rubygem-ruby-progressbar>=1.11<2:devel/rubygem-ruby-progressbar \
 	rubygem-re2>=2.20.0<3:devel/rubygem-re2 \
 	rubygem-semver_dialects>=3.7.0<4:devel/rubygem-semver_dialects \
 	rubygem-version_sorter>=2.3<3:textproc/rubygem-version_sorter \
 	rubygem-js_regex>=3.13.0<4.0:textproc/rubygem-js_regex \
 	rubygem-device_detector>=1.1.3:devel/rubygem-device_detector \
 	rubygem-redis-gitlab>=5.4.1<5.5:databases/rubygem-redis-gitlab \
 	rubygem-redis-client>=0.26.1<1:databases/rubygem-redis-client \
 	rubygem-redis-cluster-client>=0.13.5<1:databases/rubygem-redis-cluster-client \
 	rubygem-redis-clustering-gitlab>=5.4.1<5.5:databases/rubygem-redis-clustering-gitlab \
 	rubygem-connection_pool>=2.5.4<2.6:net/rubygem-connection_pool \
 	rubygem-redis-actionpack-rails-gitlab>=5.5.0<5.6:databases/rubygem-redis-actionpack-rails-gitlab \
 	rubygem-jira-ruby-gitlab>=2.3.0<2.4:devel/rubygem-jira-ruby-gitlab \
 	rubygem-atlassian-jwt>=0.2.1<0.3.0:www/rubygem-atlassian-jwt \
 	rubygem-slack-messenger>=2.3.5<2.4.0:devel/rubygem-slack-messenger \
 	rubygem-kubeclient>=4.12.0<4.13.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-sanitize60>=6.0.2<6.1:textproc/rubygem-sanitize60 \
 	rubygem-babosa>=2.0<3:textproc/rubygem-babosa \
 	rubygem-loofah>=2.24.1<2.25:textproc/rubygem-loofah \
 	rubygem-licensee-gitlab>=9.16<10:devel/rubygem-licensee-gitlab \
 	rubygem-charlock_holmes>=0.7.9<0.8:textproc/rubygem-charlock_holmes \
 	rubygem-ruby-magic>=0.6<1:devel/rubygem-ruby-magic \
 	rubygem-fast_blank>=1.0.1<1.1:devel/rubygem-fast_blank \
 	rubygem-gitlab-chronic>=0.10.6<0.11.0:devel/rubygem-gitlab-chronic \
 	rubygem-gitlab_chronic_duration>=0.12<1:devel/rubygem-gitlab_chronic_duration \
 	rubygem-rack-proxy>=0.7.7<0.8.0:www/rubygem-rack-proxy \
 	rubygem-cssbundling-rails-rails-gitlab>=1.4.3<1.5:www/rubygem-cssbundling-rails-rails-gitlab \
 	rubygem-terser>=1.0.2<1.0.3:textproc/rubygem-terser \
 	rubygem-click_house-client>=0.8.2<0.9:databases/rubygem-click_house-client \
 	rubygem-addressable>=2.8<3:www/rubygem-addressable \
 	rubygem-gon-rails-gitlab>=6.5.0<6.6:www/rubygem-gon-rails-gitlab \
 	rubygem-request_store>=1.7.0<1.8:devel/rubygem-request_store \
 	rubygem-base32>=0.3.4<0.4.0:converters/rubygem-base32 \
 	rubygem-gitlab-license>=2.6<3:devel/rubygem-gitlab-license \
 	rubygem-rack-attack>=6.8.0<6.9:www/rubygem-rack-attack \
 	rubygem-sentry-ruby>=5.23.0<5.24:devel/rubygem-sentry-ruby \
 	rubygem-sentry-rails>=5.23.0<5.24:devel/rubygem-sentry-rails \
 	rubygem-sentry-sidekiq>=5.23.0<5.24:devel/rubygem-sentry-sidekiq \
 	rubygem-pg_query>=6.1.0<6.2:databases/rubygem-pg_query \
 	rubygem-premailer-rails-rails-gitlab>=1.12.0<1.13:mail/rubygem-premailer-rails-rails-gitlab \
 	rubygem-gitlab-labkit>=0.42.2<0.43:devel/rubygem-gitlab-labkit \
 	rubygem-thrift>=0.22.0,1<0.23,1:devel/rubygem-thrift \
 	rubygem-rails-i18n-rails-gitlab>=7.0.9<8:devel/rubygem-rails-i18n-rails-gitlab \
 	rubygem-gettext_i18n_rails>=1.13.0<1.14:devel/rubygem-gettext_i18n_rails \
 	rubygem-gettext>=3.5.1<4:devel/rubygem-gettext \
 	rubygem-batch-loader>=2.0.5<2.1:devel/rubygem-batch-loader \
 	rubygem-tty-prompt>=0.23<1:devel/rubygem-tty-prompt \
 	rubygem-peek-rails-gitlab>=1.1<2.0:devel/rubygem-peek-rails-gitlab \
 	rubygem-snowplow-tracker>=0.8.0<1:devel/rubygem-snowplow-tracker \
 	rubygem-webrick>=1.9.0<1.10:www/rubygem-webrick \
 	rubygem-prometheus-client-mmap>=1.2.10<1.3:devel/rubygem-prometheus-client-mmap \
 	rubygem-async-gitlab>=2.32.0<2.33:devel/rubygem-async-gitlab \
 	rubygem-io-event>=1.12.1<2:devel/rubygem-io-event \
 	rubygem-gitlab-security_report_schemas>=0.1.3.min15.0.0.max15.2.3<0.1.3.min15.0.0.max15.2.4:devel/rubygem-gitlab-security_report_schemas \
 	rubygem-vite_rails-gitlab>=3.0.17<3.1:devel/rubygem-vite_rails-gitlab \
 	rubygem-vite_ruby-gitlab>=3.9.0<3.10:devel/rubygem-vite_ruby-gitlab \
 	rubygem-opentelemetry-sdk>=1.5.0:devel/rubygem-opentelemetry-sdk \
 	rubygem-opentelemetry-exporter-otlp>=0.29.1:devel/rubygem-opentelemetry-exporter-otlp \
 	rubygem-opentelemetry-instrumentation-active_support>=0.6.0:devel/rubygem-opentelemetry-instrumentation-active_support \
 	rubygem-opentelemetry-instrumentation-action_pack>=0.10.0:devel/rubygem-opentelemetry-instrumentation-action_pack \
 	rubygem-opentelemetry-instrumentation-active_job>=0.7.7:devel/rubygem-opentelemetry-instrumentation-active_job \
 	rubygem-opentelemetry-instrumentation-active_record>=0.8.1:devel/rubygem-opentelemetry-instrumentation-active_record \
 	rubygem-opentelemetry-instrumentation-action_view>=0.7.2:devel/rubygem-opentelemetry-instrumentation-action_view \
 	rubygem-opentelemetry-instrumentation-aws_sdk>=0.5.4:devel/rubygem-opentelemetry-instrumentation-aws_sdk \
 	rubygem-opentelemetry-instrumentation-http>=0.23.4:devel/rubygem-opentelemetry-instrumentation-http \
 	rubygem-opentelemetry-instrumentation-concurrent_ruby>=0.21.4:devel/rubygem-opentelemetry-instrumentation-concurrent_ruby \
 	rubygem-opentelemetry-instrumentation-ethon>=0.21.9:devel/rubygem-opentelemetry-instrumentation-ethon \
 	rubygem-opentelemetry-instrumentation-excon>=0.22.5:devel/rubygem-opentelemetry-instrumentation-excon \
 	rubygem-opentelemetry-instrumentation-faraday>=0.24.7:devel/rubygem-opentelemetry-instrumentation-faraday \
 	rubygem-opentelemetry-instrumentation-grape>=0.2.0:devel/rubygem-opentelemetry-instrumentation-grape \
 	rubygem-opentelemetry-instrumentation-graphql>=0.28.4:devel/rubygem-opentelemetry-instrumentation-graphql \
 	rubygem-opentelemetry-instrumentation-http_client>=0.22.8:devel/rubygem-opentelemetry-instrumentation-http_client \
 	rubygem-opentelemetry-instrumentation-net_http>=0.22.8:devel/rubygem-opentelemetry-instrumentation-net_http \
 	rubygem-opentelemetry-instrumentation-pg>=0.29.1:devel/rubygem-opentelemetry-instrumentation-pg \
 	rubygem-opentelemetry-instrumentation-rack>=0.24.6:devel/rubygem-opentelemetry-instrumentation-rack \
 	rubygem-opentelemetry-instrumentation-rails>=0.33.1:devel/rubygem-opentelemetry-instrumentation-rails \
 	rubygem-opentelemetry-instrumentation-rake>=0.2.1:devel/rubygem-opentelemetry-instrumentation-rake \
 	rubygem-opentelemetry-instrumentation-redis>=0.25.7:devel/rubygem-opentelemetry-instrumentation-redis \
 	rubygem-opentelemetry-instrumentation-sidekiq>=0.25.7:devel/rubygem-opentelemetry-instrumentation-sidekiq \
 	rubygem-warning>=1.5.0<1.6:devel/rubygem-warning \
 	rubygem-git>=1.19.1<2:devel/rubygem-git \
 	rubygem-gitlab-dangerfiles>=4.10.0<4.11:devel/rubygem-gitlab-dangerfiles \
 	rubygem-license_finder-gitlab>=7.2.1<8:devel/rubygem-license_finder-gitlab \
 	rubygem-rspec>=3.0<4:devel/rubygem-rspec \
 	rubygem-octokit-gitlab>=9.0<10:net/rubygem-octokit-gitlab \
 	rubygem-faraday-multipart>=1.1.1<2:www/rubygem-faraday-multipart \
 	rubygem-gitlab-mail_room>=0.0.27<0.1.0:mail/rubygem-gitlab-mail_room \
 	rubygem-email_reply_trimmer>=0.1<1.0:mail/rubygem-email_reply_trimmer \
 	rubygem-html2text>=0.4.0:textproc/rubygem-html2text \
 	rubygem-stackprof>=0.2.27<0.3:devel/rubygem-stackprof \
 	rubygem-rbtrace>=0.5.2<1.0:devel/rubygem-rbtrace \
 	rubygem-memory_profiler>=1.1.0<2.0:devel/rubygem-memory_profiler \
 	rubygem-oauth2-gitlab>=2.0.10<3:net/rubygem-oauth2-gitlab \
 	rubygem-health_check-rails-gitlab>=3.0<4:devel/rubygem-health_check-rails-gitlab \
 	rubygem-vmstat>=2.3.1<2.4.0:sysutils/rubygem-vmstat \
 	rubygem-sys-filesystem14>=1.4.3<1.5:sysutils/rubygem-sys-filesystem14 \
 	rubygem-net-ntp>0:net/rubygem-net-ntp \
 	rubygem-ssh_data>=2.0<3:security/rubygem-ssh_data \
 	rubygem-spamcheck>=1.3.3<1.4:net/rubygem-spamcheck \
 	rubygem-gitaly>=18.6.0:net/rubygem-gitaly \
 	rubygem-gitlab-kas-grpc>=${GITLAB_KAS_GRPC_VERSION}:net/rubygem-gitlab-kas-grpc \
 	rubygem-grpc-gitlab>=1.76.0<1.77:net/rubygem-grpc-gitlab \
 	rubygem-google-protobuf3>=3.25.8<4:devel/rubygem-google-protobuf3 \
 	rubygem-toml-rb>=2.2.0<3:www/rubygem-toml-rb \
 	rubygem-flipper-gitlab>=0.28.0<0.29:devel/rubygem-flipper-gitlab \
 	rubygem-flipper-active_record-rails-gitlab>=0.28.0<0.29:databases/rubygem-flipper-active_record-rails-gitlab \
 	rubygem-flipper-active_support_cache_store-rails-gitlab>=0.28.0<0.29:devel/rubygem-flipper-active_support_cache_store-rails-gitlab \
 	rubygem-unleash>=3.2.2<3.3:devel/rubygem-unleash \
 	rubygem-gitlab-experiment>=1.0.0<1.1:devel/rubygem-gitlab-experiment \
 	rubygem-lograge-rails-gitlab>=0.11.2<1.0:www/rubygem-lograge-rails-gitlab \
 	rubygem-grape_logging-gitlab>=1.8.4<2.0:devel/rubygem-grape_logging-gitlab \
 	rubygem-gitlab-net-dns>=0.15.0<0.16: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-gitlab>=2.9.0<2.9.1:mail/rubygem-mail-gitlab \
 	rubygem-lockbox>=1.4.1<1.5:security/rubygem-lockbox \
 	rubygem-valid_email>=0.1<1:mail/rubygem-valid_email \
 	rubygem-jsonb_accessor>=1.4<2:www/rubygem-jsonb_accessor \
 	rubygem-json-gitlab>=2.13.1<2.14:devel/rubygem-json-gitlab \
 	rubygem-json_schemer>=2.3.0<2.4:devel/rubygem-json_schemer \
 	rubygem-oj>=3.16.11<3.17:devel/rubygem-oj \
 	rubygem-oj-introspect>=0.8<1:devel/rubygem-oj-introspect \
 	rubygem-multi_json-gitlab>=1.17.0<1.18:devel/rubygem-multi_json-gitlab \
 	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.4.0<1.5:security/rubygem-ed25519 \
 	rubygem-cvss-suite>=3.3.0<3.4:security/rubygem-cvss-suite \
 	rubygem-arr-pm>=0.0.12<0.1:devel/rubygem-arr-pm \
 	rubygem-devfile>=0.4.8<0.5:net/rubygem-devfile \
 	rubygem-hashdiff>=1.2.1<1.3:devel/rubygem-hashdiff \
 	rubygem-CFPropertyList-gitlab>=3.0.7<3.1:devel/rubygem-CFPropertyList-gitlab \
 	rubygem-app_store_connect>=0:net/rubygem-app_store_connect \
 	rubygem-telesignenterprise>=2.6<3:devel/rubygem-telesignenterprise \
 	rubygem-base6402>=0.2.0<0.3:converters/rubygem-base6402 \
 	rubygem-net-protocol>=0.2.2<0.3:net/rubygem-net-protocol \
 	rubygem-nkf>=0.2.0<0.3:net/rubygem-nkf \
 	rubygem-net-http-gitlab>=0.6.0<0.6.1:www/rubygem-net-http-gitlab \
 	rubygem-uri-gitlab>=0.13.3<0.13.4:net/rubygem-uri-gitlab \
 	rubygem-duo_api>=1.4<2:security/rubygem-duo_api \
 	rubygem-gitlab-sdk>=0.3.0<0.4:devel/rubygem-gitlab-sdk \
 	rubygem-paper_trail>=16.0<17:devel/rubygem-paper_trail \
 	rubygem-i18n_data>=0.13.1<1:devel/rubygem-i18n_data \
 	rubygem-gitlab-cloud-connector>=1.35<2:security/rubygem-gitlab-cloud-connector \
 	rubygem-google-cloud-profiler-v2>=0.3<1:textproc/rubygem-google-cloud-profiler-v2 \
 	rubygem-parallel>=1.27.0<2:sysutils/rubygem-parallel \
 	rubygem-google-cloud-storage_transfer-gitlab>=1.2.0<1.3:net/rubygem-google-cloud-storage_transfer-gitlab \
 	rubygem-minitest>=5.11<6:devel/rubygem-minitest \
 	rubygem-grpc-tools>=1.69.0<1.70:net/rubygem-grpc-tools \
 	rubygem-opensearch-ruby-gitlab>=0:textproc/rubygem-opensearch-ruby-gitlab
 
 BUILD_DEPENDS=	gem:devel/ruby-gems \
 	${MY_DEPENDS}
 
 RUN_DEPENDS=	gmake>=4.4.1:devel/gmake \
 	${MY_DEPENDS}
 
 FLAVORS=	ce ee
 FLAVOR?=	${FLAVORS:[1]}
 
 USES=		nodejs:env python:run ruby shebangfix
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 .if ${FLAVOR:U} == ee
 GL_PROJECT=	gitlab
 .else # ce
 GL_PROJECT=	gitlab-foss
 .endif
 
 USE_RC_SUBR=	gitlab
 
 SHEBANG_FILES=	gems/bundler-checksum/test/project_with_checksum_lock/scripts/test \
 		scripts/aigw-tagging.sh \
 		scripts/build_assets_image \
 		scripts/build_qa_image \
 		scripts/build_gdk_image \
 		scripts/compile_assets \
 		scripts/db_tasks \
 		scripts/rails-update-bisect \
 		scripts/frontend/codemods/vuex-to-pinia/migrate.sh \
 		scripts/frontend/execute-on-staged-files.sh \
 		scripts/frontend/start_storybook.sh \
 		scripts/validate-monorepo-gem \
 		.lefthook/gitleaks.sh \
 		.lefthook/pre-push/merge_conflicts \
 		qa/gdk/entrypoint \
 		qa/bin/test \
 		vendor/gems/sidekiq/scripts/update-sidekiq.sh
 
 CONFLICTS_INSTALL=	gitolite \
 			gitolite2 \
 			gogs \
 			gitea \
 			gitosis
 
 # We install the CE and EE flavor in the same directory
 WWWDIR=		${PREFIX}/www/gitlab
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 USERS=	git
 GROUPS=	git
 
 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
 
 post-patch:
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" -e "s|%%LOCALBASE%%|${LOCALBASE}|" -e "s|%%WWWDIR%%|${WWWDIR}|" ${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
 	# Correct link for pipeline secret scanning tool
 	${REINPLACE_CMD}  -e 's|/analyzer run|/usr/local/bin/analyzer run|g' \
 		${WRKSRC}/lib/gitlab/ci/templates/Jobs/*.yml
 
 do-install:
 	${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample
 	# TODO: Vendored gems are installing binaries not into STAGEDIR, this needs to be fixed.
 	# As intermediate solution, the binaries are not disabled by patches
 	#(cd ${WRKSRC} && ${RM} Gemfile.lock && bundle config set path ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER} && ${WRK_ENV} ${GEM_ENV} bundle install --local)
 	(cd ${WRKSRC} && bundle config set --local bin .bin)
 	# should skip development and test, but does not work
 	#(cd ${WRKSRC} && bundle config set --local without development test)
 	#(cd ${WRKSRC} && cat .bundle/config)
 	(cd ${WRKSRC} && ${RM} Gemfile.lock && ${WRK_ENV} ${GEM_ENV} bundle install --local)
 	(cd ${WRKSRC} && bundle binstubs --all --path .bin)
 	${RM} -R ${WRKSRC}/workhorse
 	# remove vendored sidekiq gem as it breaks gitlab 17.1.0 for FreeBSD
 	# See also: https://gitlab.com/gitlab-org/gitlab/-/issues/468435
 	#${RM} -R ${WRKSRC}/vendor/gems/sidekiq-7.1.6
 	${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" | sort
 	${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/puma.rb.example ${WRKSRC}/config/puma.rb.sample
 	${MV} ${WRKSRC}/config/redis.yml.example ${WRKSRC}/config/redis.yml.sample
 	${MV} ${WRKSRC}/config/resque.yml.example ${WRKSRC}/config/resque.yml.sample
 	${MV} ${WRKSRC}/config/secrets.yml.example ${WRKSRC}/config/secrets.yml.sample
 	${MV} ${WRKSRC}/config/session_store.yml.example ${WRKSRC}/config/session_store.yml.sample
 	${MV} ${WRKSRC}/config/sidekiq.yml.example ${WRKSRC}/config/sidekiq.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
 	${MV} ${WRKSRC}/public/robots.txt ${WRKSRC}/public/robots.txt.sample
 	${MKDIR} ${STAGEDIR}${WWWDIR}/app/assets/builds
 	${MKDIR} ${STAGEDIR}${WWWDIR}/config/helpers/tailwind
 	${MKDIR} ${STAGEDIR}${WWWDIR}/public/assets
 	${MKDIR} ${STAGEDIR}${WWWDIR}/public/uploads
 	${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/cache
 	${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/sessions
 	${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/backups
 	${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/sockets/private/internal
 	${MKDIR} ${STAGEDIR}${WWWDIR}/shared/external-diffs
 	${MKDIR} ${STAGEDIR}${WWWDIR}/shared/tmp
 	${MKDIR} ${STAGEDIR}${WWWDIR}/shared/artifacts/tmp/work
 	${MKDIR} ${STAGEDIR}${WWWDIR}/vendor/assets/stylesheets
 	${MKDIR} ${STAGEDIR}${WWWDIR}/workhorse/changelogs/unreleased
 	# Skip file having an executable bit
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} "-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}${WWWDIR} "-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) #; \
 		/database.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/builds/" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/images/auth_buttons/" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/javascripts/locale/" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/javascripts/pipeline_wizard/templates/" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(git,git,554) ${WWWDIR_REL}/bin" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/config" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(git,git,755) ${WWWDIR_REL}/config/helpers/tailwind" >> ${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/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/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/external-diffs" >> ${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}
 .if ${FLAVOR:U} == ee
 	# Gitlab-ee version
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/ee/db/active_context/migrate" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/gems/gitlab-backup-cli/tmp" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/api/4_verify" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/api/5_package" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/api/8_monitor" >> ${TMPPLIST}
 .endif
 
 .if !defined(_GITLAB_MAKESUM_GUARD)
 makesum:
 	${MAKE} -D_GITLAB_MAKESUM_GUARD makesum DISTINFO_FILE=${.CURDIR}/distinfo FLAVOR=ce
 	${MAKE} -D_GITLAB_MAKESUM_GUARD makesum DISTINFO_FILE=${.CURDIR}/distinfo.ee FLAVOR=ee
 	${CAT} ${.CURDIR}/distinfo.ee >> ${.CURDIR}/distinfo
 	${RM} ${.CURDIR}/distinfo.ee
 	(cd ../../devel/gitaly && ${MAKE} makesum)
 	(cd ../../net/gitlab-agent && ${MAKE} makesum)
 	(cd ../../www/gitlab-pages && ${MAKE} makesum)
 	(cd ../../www/gitlab-workhorse && ${MAKE} makesum)
 	(cd ../../net/rubygem-gitlab-kas-grpc && ${MAKE} makesum)
 	(cd ../../www/rubygem-rails-gitlab && ${MAKE} makesum)
 	(cd ../../www/rubygem-actioncable-gitlab && ${MAKE} makesum)
 	(cd ../../mail/rubygem-actionmailbox-gitlab && ${MAKE} makesum)
 	(cd ../../mail/rubygem-actionmailer-gitlab && ${MAKE} makesum)
 	(cd ../../www/rubygem-actionpack-gitlab && ${MAKE} makesum)
 	(cd ../../textproc/rubygem-actiontext-gitlab && ${MAKE} makesum)
 	(cd ../../devel/rubygem-actionview-gitlab && ${MAKE} makesum)
 	(cd ../../devel/rubygem-activejob-gitlab && ${MAKE} makesum)
 	(cd ../../databases/rubygem-activemodel-gitlab && ${MAKE} makesum)
 	(cd ../../databases/rubygem-activerecord-gitlab && ${MAKE} makesum)
 	(cd ../../net/rubygem-activestorage-gitlab && ${MAKE} makesum)
 	(cd ../../devel/rubygem-activesupport-gitlab && ${MAKE} makesum)
 	(cd ../../www/rubygem-railties-gitlab && ${MAKE} makesum)
 	(cd ../../databases/rubygem-globalid-rails-gitlab && ${MAKE} makesum)
 	(cd ../../www/rubygem-responders-rails-gitlab && ${MAKE} makesum)
 
 .endif
 
 .include "${.CURDIR}/Makefile.common"
 .include <bsd.port.mk>
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index 85156f73a42d..0b3200a8fbe3 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,19 +1,19 @@
-GITLAB_VERSION=		18.6.1
+GITLAB_VERSION=		18.6.2
 GITLAB_PORTREVISION=	3	# decrease this only if GITLAB_KAS_GRPC_VERSION is upgraded
 
 # Git version gitaly should use (from gitlab mirror)
 # Find current tag from Makefile and .gitlab-ci.yaml
 # and from https://gitlab.com/gitlab-org/git/-/tags
 GITLAB_GIT_VERSION=	2.50.0
 # return something like x.yy
 GITLAB_GIT_VERSION_SHORT=	${GITLAB_GIT_VERSION:C/^([0-9]*\.[0-9]*)\..*/\1/}
 GITLAB_GIT_MASTER_VERSION=	419c72cb8ada252b260efc38ff91fe201de7c8c3
 GITLAB_GIT_PREV_VERSION=	23466173824c0a0f835c0d790c2f38156ae6284a
 
 # Overwrite version for gitlab-kas-grpc
 #GITLAB_KAS_GRPC_VERSION=	${GITLAB_VERSION}
 GITLAB_KAS_GRPC_VERSION=	18.5.2
 
 # Rails version
 RAILS_VERSION=	7.1.6
 
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index 63867e3852b9..ca63e8700ceb 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1764220477
-SHA256 (gitlab-foss-v18.6.1.tar.bz2) = d85d6d824089cc12016fa8d3a5037cd254dff3c1e8ad477e6a1153851161e1a0
-SIZE (gitlab-foss-v18.6.1.tar.bz2) = 126836032
-TIMESTAMP = 1764220540
-SHA256 (gitlab-v18.6.1-ee.tar.bz2) = d26f8ce1949e9283ce6766e46798752a448c78055f47d82d6433fcf27aaacd6d
-SIZE (gitlab-v18.6.1-ee.tar.bz2) = 143698518
+TIMESTAMP = 1765426102
+SHA256 (gitlab-foss-v18.6.2.tar.bz2) = 6e0ee01b940be896e256ced4d312967101e489556a9ac30d3c413a8986272c4e
+SIZE (gitlab-foss-v18.6.2.tar.bz2) = 126869309
+TIMESTAMP = 1765426143
+SHA256 (gitlab-v18.6.2-ee.tar.bz2) = 7c53ea1b62d8061c1f7c125e390398b709cd9a325cbf2c23e35b736a48736db4
+SIZE (gitlab-v18.6.2-ee.tar.bz2) = 143720563
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index cfe5cabc50e5..b2222c8a2f81 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,197 +1,197 @@
---- Gemfile.orig	2025-11-19 16:58:17 UTC
+--- Gemfile.orig	2025-12-10 01:46:48 UTC
 +++ Gemfile
 @@ -169,7 +169,7 @@ gem 'graphql', '2.5.11', feature_category: :api
  
  # GraphQL API
  gem 'graphql', '2.5.11', feature_category: :api
 -gem 'graphql-docs', '~> 5.2.0', group: [:development, :test], feature_category: :api
 +#gem 'graphql-docs', '~> 5.2.0', group: [:development, :test], feature_category: :api
  gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api
  
  # Cells
 @@ -299,7 +299,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature
  gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared
  
  # Background jobs
 -gem 'sidekiq', path: 'vendor/gems/sidekiq', require: 'sidekiq', feature_category: :scalability
 +gem 'sidekiq', '>= 7.3.9', require: 'sidekiq', feature_category: :scalability
  gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability
  gem 'gitlab-sidekiq-fetcher',
    path: 'vendor/gems/sidekiq-reliable-fetch',
 @@ -476,141 +476,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared
  
  gem 'warning', '~> 1.5.0', feature_category: :shared
  
 -group :development do
 -  gem 'lefthook', '~> 1.13.0', require: false, feature_category: :tooling
 -  gem 'rubocop', feature_category: :tooling, require: false
 -  gem 'debug', '~> 1.11.0', feature_category: :shared
 -
 -  gem 'solargraph', '~> 0.54.0', require: false, feature_category: :shared
 -  gem 'solargraph-rspec', '~> 0.5.1', require: false, feature_category: :shared
 -
 -  gem 'letter_opener_web', '~> 3.0.0', feature_category: :shared
 -  gem 'lookbook', '~> 2.3', feature_category: :shared
 -
 -  # Better errors handler
 -  gem 'better_errors', '~> 2.10.1', feature_category: :shared
 -
 -  gem 'sprite-factory', '~> 1.7', feature_category: :shared
 -
 -  gem 'listen', '~> 3.7', feature_category: :shared
 -
 -  gem 'ruby-lsp', "~> 0.26.0", require: false, feature_category: :tooling
 -
 -  gem 'ruby-lsp-rails', "~> 0.4.8", feature_category: :tooling
 -
 -  gem 'ruby-lsp-rspec', "~> 0.1.27", require: false, feature_category: :tooling
 -
 -  gem 'gdk-toogle', '~> 0.9', '>= 0.9.5', require: 'toogle', feature_category: :tooling
 -
 -  # Used by
 -  # * `lib/tasks/gitlab/security/update_banned_ssh_keys.rake`
 -  # * `lib/tasks/gitlab/db/migration_squash.rake`
 -  gem 'git', '~> 1.8', feature_category: :shared
 -end
 -
 -group :development, :test do
 -  gem 'deprecation_toolkit', '~> 2.2.3', require: false, feature_category: :shared
 -  gem 'bullet', '~> 8.0.0', feature_category: :shared
 -  gem 'parser', '= 3.3.10.0', feature_category: :shared
 -  gem 'pry-byebug', feature_category: :shared
 -  gem 'pry-rails', '~> 0.3.9', feature_category: :shared
 -  gem 'pry-shell', '~> 0.6.4', feature_category: :shared
 -
 -  gem 'amazing_print', require: false, feature_category: :shared
 -
 -  gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database
 -  gem 'rspec-rails', '~> 7.1.0', feature_category: :shared
 -  gem 'factory_bot_rails', '~> 6.5.0', feature_category: :tooling
 -
 -  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
 -  gem 'minitest', '~> 5.11.0', feature_category: :shared
 -
 -  gem 'spring', '~> 4.3.0', feature_category: :shared
 -  gem 'spring-commands-rspec', '~> 1.0.4', feature_category: :shared
 -
 -  gem 'gitlab-styles', '~> 13.1.0', feature_category: :tooling, require: false
 -  gem 'haml_lint', '~> 0.58', feature_category: :tooling, require: false
 -
 -  # Benchmarking & profiling
 -  gem 'benchmark-ips', '~> 2.14.0', require: false, feature_category: :shared
 -  gem 'benchmark-memory', '~> 0.1', require: false, feature_category: :shared
 -
 -  gem 'knapsack', '~> 4.0.0', feature_category: :tooling
 -  gem 'gitlab-crystalball', '~> 1.1.0', require: false, feature_category: :tooling
 -  gem 'test_file_finder', '~> 0.3.1', feature_category: :tooling
 -
 -  gem 'simple_po_parser', '~> 1.1.6', require: false, feature_category: :shared
 -
 -  gem 'png_quantizator', '~> 0.2.1', require: false, feature_category: :shared
 -
 -  gem 'parallel', '~> 1.19', require: false, feature_category: :shared
 -
 -  gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup', feature_category: :shared
 -
 -  gem 'pact', '~> 1.64', feature_category: :shared
 -
 -  gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling
 -
 -  gem 'yard', '~> 0.9', require: false, feature_category: :tooling
 -end
 -
  group :development, :test, :danger do
    gem 'gitlab-dangerfiles', '~> 4.10.0', require: false, feature_category: :tooling
  end
  
 -group :development, :test, :coverage do
 -  gem 'simplecov', '~> 0.22', require: false, feature_category: :tooling
 -  gem 'simplecov-lcov', '~> 0.8.0', require: false, feature_category: :tooling
 -  gem 'simplecov-cobertura', '~> 3.1.0', require: false, feature_category: :tooling
 -  gem 'undercover', '~> 0.7.0', require: false, feature_category: :tooling
 -end
 -
  # Gems required in omnibus-gitlab pipeline
  group :development, :test, :omnibus do
    gem 'license_finder', '~> 7.0', require: false, feature_category: :shared
  end
  
 -# Gems required in various pipelines
 -group :development, :test, :monorepo do
 -  gem 'gitlab-rspec', path: 'gems/gitlab-rspec', feature_category: :shared
 -  gem 'gitlab-rspec_flaky', path: 'gems/gitlab-rspec_flaky', feature_category: :tooling
 -end
 -
 -group :test do
 -  gem 'rspec-retry', '~> 0.6.2', feature_category: :tooling
 -  gem 'rspec_profiling', '~> 0.0.9', feature_category: :tooling
 -  gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling
 -  gem 'rspec-parameterized', '~> 1.0', '>= 1.0.2', require: false, feature_category: :tooling
 -  gem 'os', '~> 1.1', '>= 1.1.4', feature_category: :tooling
 -
 -  gem 'capybara', '~> 3.40', feature_category: :test_platform
 -  gem 'capybara-screenshot', '~> 1.0.26', feature_category: :test_platform
 -  gem 'selenium-webdriver', '~> 4.21', '>= 4.21.1', feature_category: :test_platform
 -
 -  gem 'graphlyte', '~> 1.0.0', feature_category: :shared
 -
 -  # Upload CI metrics to a GCP BigQuery instance
 -  #
 -  # We only use this gem in CI.
 -  gem 'google-cloud-bigquery', '~> 1.0', feature_category: :tooling
 -
 -  gem 'shoulda-matchers', '~> 6.4.0', require: false, feature_category: :shared
 -  gem 'email_spec', '~> 2.3.0', feature_category: :shared
 -  gem 'webmock', '~> 3.25.0', feature_category: :shared
 -  gem 'rails-controller-testing', feature_category: :shared
 -  gem 'concurrent-ruby', '~> 1.1', feature_category: :shared
 -  gem 'test-prof', '~> 1.4.0', feature_category: :tooling
 -  gem 'rspec_junit_formatter', feature_category: :shared
 -  gem 'guard-rspec', feature_category: :shared
 -  gem 'axe-core-rspec', '~> 4.10.0', feature_category: :tooling
 -  gem 'state_machines-rspec', '~> 0.6', feature_category: :shared
 -
 -  # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
 -  gem 'derailed_benchmarks', require: false, feature_category: :shared
 -
--  gem 'gitlab_quality-test_tooling', '~> 2.26.0', require: false, feature_category: :tooling
+-  gem 'gitlab_quality-test_tooling', '~> 3.1.0', require: false, feature_category: :tooling
 -end
 -
  gem 'octokit', '~> 9.0', feature_category: :importers
  # Needed by octokit: https://github.com/octokit/octokit.rb/pull/1688
  gem 'faraday-multipart', '~> 1.0', feature_category: :importers
 @@ -647,7 +521,7 @@ gem 'gitaly', '~> 18.6.0.pre.rc1', feature_category: :
  gem 'gitaly', '~> 18.6.0.pre.rc1', feature_category: :gitaly
  
  # KAS GRPC protocol definitions
 -gem 'gitlab-kas-grpc', '~> 18.5.0-rc4', feature_category: :deployment_management
 +gem 'gitlab-kas-grpc', '~> 18.5.2', feature_category: :deployment_management
  
  gem 'grpc', '~> 1.76.0', feature_category: :shared
  
 @@ -670,7 +544,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :
  gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :shared
  
  # Countries list
 -gem 'countries', '~> 4.0.0', feature_category: :shared
 +gem 'countries', '~> 4.0', feature_category: :shared
  
  gem 'retriable', '~> 3.1.2', feature_category: :shared
  
 @@ -755,10 +629,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
  
  gem 'duo_api', '~> 1.3', feature_category: :system_access
  
 +gem 'parser'
 +gem 'net-smtp'
 +gem 'net-pop'
 +gem 'psych', '~> 3.1'
 +
  gem 'gitlab-sdk', '~> 0.3.0', feature_category: :application_instrumentation
  
  gem 'paper_trail', '~> 16.0', feature_category: :shared
  
 -gem "i18n_data", "~> 0.13.1", feature_category: :system_access
 +gem "i18n_data", "~> 0.13", feature_category: :system_access
  
  gem "gitlab-cloud-connector", "~> 1.35", require: 'gitlab/cloud_connector', feature_category: :plan_provisioning