git: 3aab6816e6a8 - main - www/gitlab: security and bugfix update to 18.5.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 13 Nov 2025 08:40:52 UTC
The branch main has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=3aab6816e6a827c72c7dd473b4d066ddd090dbe5
commit 3aab6816e6a827c72c7dd473b4d066ddd090dbe5
Author: Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2025-11-13 08:38:22 +0000
Commit: Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2025-11-13 08:40:49 +0000
www/gitlab: security and bugfix update to 18.5.2
With the upgrade of node from 22 to 24 I see the need of more memory
for the asset compilation.
Plan to provide one more GB memory to your gitlab instance.
Changes: https://about.gitlab.com/releases/2025/11/12/patch-release-gitlab-18-5-2-released/
Security: 5a1d6309-c04a-11f0-85d8-2cf05da270f3
---
devel/gitaly/distinfo | 18 +++----
net/gitlab-agent/distinfo | 10 ++--
net/rubygem-gitaly/Makefile | 2 +-
net/rubygem-gitaly/distinfo | 6 +--
net/rubygem-gitlab-kas-grpc/distinfo | 6 +--
textproc/rubygem-gitlab-glfm-markdown/Makefile | 3 +-
.../rubygem-gitlab-glfm-markdown/Makefile.crates | 25 ++++------
textproc/rubygem-gitlab-glfm-markdown/distinfo | 56 ++++++++--------------
www/gitlab-pages/distinfo | 10 ++--
www/gitlab-workhorse/distinfo | 10 ++--
www/gitlab/Makefile | 9 ++--
www/gitlab/Makefile.common | 4 +-
www/gitlab/distinfo | 12 ++---
www/gitlab/files/patch-Gemfile | 16 +++----
14 files changed, 80 insertions(+), 107 deletions(-)
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 87b558e17743..2d8fd76d3a5a 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1761544111
-SHA256 (go/devel_gitaly/gitaly-v18.5.1/go.mod) = 103dce63500bcc4d831877292de059e6aff0001c595bd10a20458e1c4b191dfc
-SIZE (go/devel_gitaly/gitaly-v18.5.1/go.mod) = 13012
-SHA256 (go/devel_gitaly/gitaly-v18.5.1/gitaly-v18.5.1.tar.bz2) = c78f6f5a5f386d1212b576ff097de723a08b0b283d1fd74c6c456ae6c6c00c53
-SIZE (go/devel_gitaly/gitaly-v18.5.1/gitaly-v18.5.1.tar.bz2) = 4605152
-SHA256 (go/devel_gitaly/gitaly-v18.5.1/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4
-SIZE (go/devel_gitaly/gitaly-v18.5.1/git-v2.50.0.tar.bz2) = 9249878
-SHA256 (go/devel_gitaly/gitaly-v18.5.1/gitlab-org-git-23466173824c0a0f835c0d790c2f38156ae6284a_GL0.tar.gz) = 01a4069b15e9262151b3b97f989d4939ba8966bd5269875add2a34806817c01a
-SIZE (go/devel_gitaly/gitaly-v18.5.1/gitlab-org-git-23466173824c0a0f835c0d790c2f38156ae6284a_GL0.tar.gz) = 11745131
+TIMESTAMP = 1763010405
+SHA256 (go/devel_gitaly/gitaly-v18.5.2/go.mod) = 103dce63500bcc4d831877292de059e6aff0001c595bd10a20458e1c4b191dfc
+SIZE (go/devel_gitaly/gitaly-v18.5.2/go.mod) = 13012
+SHA256 (go/devel_gitaly/gitaly-v18.5.2/gitaly-v18.5.2.tar.bz2) = 85b3994ce1e8618865a340e6e7773808e2e634cd4c3997c996ea7aa7f06f8a00
+SIZE (go/devel_gitaly/gitaly-v18.5.2/gitaly-v18.5.2.tar.bz2) = 4605362
+SHA256 (go/devel_gitaly/gitaly-v18.5.2/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4
+SIZE (go/devel_gitaly/gitaly-v18.5.2/git-v2.50.0.tar.bz2) = 9249878
+SHA256 (go/devel_gitaly/gitaly-v18.5.2/gitlab-org-git-23466173824c0a0f835c0d790c2f38156ae6284a_GL0.tar.gz) = 01a4069b15e9262151b3b97f989d4939ba8966bd5269875add2a34806817c01a
+SIZE (go/devel_gitaly/gitaly-v18.5.2/gitlab-org-git-23466173824c0a0f835c0d790c2f38156ae6284a_GL0.tar.gz) = 11745131
diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo
index b7d4e8a88536..24f3d70b2165 100644
--- a/net/gitlab-agent/distinfo
+++ b/net/gitlab-agent/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1761544127
-SHA256 (go/net_gitlab-agent/gitlab-agent-v18.5.1/v18.5.1.mod) = 67dbe3124c9bcd1856d46f400f4270face097bbf16f0080dd0ae9764c96a16c4
-SIZE (go/net_gitlab-agent/gitlab-agent-v18.5.1/v18.5.1.mod) = 9858
-SHA256 (go/net_gitlab-agent/gitlab-agent-v18.5.1/v18.5.1.zip) = 5e245d0c0651b9a1ce094b8cfad7c79b4c1760bfdf8e9cd1b0c5497ece3c6e8f
-SIZE (go/net_gitlab-agent/gitlab-agent-v18.5.1/v18.5.1.zip) = 1955334
+TIMESTAMP = 1763010406
+SHA256 (go/net_gitlab-agent/gitlab-agent-v18.5.2/v18.5.2.mod) = 67dbe3124c9bcd1856d46f400f4270face097bbf16f0080dd0ae9764c96a16c4
+SIZE (go/net_gitlab-agent/gitlab-agent-v18.5.2/v18.5.2.mod) = 9858
+SHA256 (go/net_gitlab-agent/gitlab-agent-v18.5.2/v18.5.2.zip) = 928a21f8ef1f33478c0efd1d4551d5d8c2123251584f9e6ae964b8f4742d22bb
+SIZE (go/net_gitlab-agent/gitlab-agent-v18.5.2/v18.5.2.zip) = 1957278
diff --git a/net/rubygem-gitaly/Makefile b/net/rubygem-gitaly/Makefile
index 9c54667a78fc..ca4b285c1e0c 100644
--- a/net/rubygem-gitaly/Makefile
+++ b/net/rubygem-gitaly/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitaly
-PORTVERSION= 18.4.3
+PORTVERSION= 18.5.1
CATEGORIES= net rubygems
MASTER_SITES= RG
diff --git a/net/rubygem-gitaly/distinfo b/net/rubygem-gitaly/distinfo
index c23ecace7aca..0297b821bee4 100644
--- a/net/rubygem-gitaly/distinfo
+++ b/net/rubygem-gitaly/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1761394826
-SHA256 (rubygem/gitaly-18.4.3.gem) = 55b44ecb5f78374bede6803f5965ca5ca93bbc7c8fca6ab3a4e9e48906a07c4c
-SIZE (rubygem/gitaly-18.4.3.gem) = 53248
+TIMESTAMP = 1763011058
+SHA256 (rubygem/gitaly-18.5.1.gem) = 70d23f4fc787c87ee88d33f32eebf1702299c262bdc09490c2faf05cb1eec90b
+SIZE (rubygem/gitaly-18.5.1.gem) = 53760
diff --git a/net/rubygem-gitlab-kas-grpc/distinfo b/net/rubygem-gitlab-kas-grpc/distinfo
index 255c74eaac68..ee5c0062ea07 100644
--- a/net/rubygem-gitlab-kas-grpc/distinfo
+++ b/net/rubygem-gitlab-kas-grpc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1761544152
-SHA256 (rubygem/gitlab-kas-grpc-18.5.1.gem) = 518f5ce705b186358e9c8594f608672a3b87509efc0e357f5e0a82c66020bc0e
-SIZE (rubygem/gitlab-kas-grpc-18.5.1.gem) = 11264
+TIMESTAMP = 1763010423
+SHA256 (rubygem/gitlab-kas-grpc-18.5.2.gem) = b6228b81bd0e2e7c8c3f279fd05865c8e846d8031374ea8b0378217c1c68e816
+SIZE (rubygem/gitlab-kas-grpc-18.5.2.gem) = 11264
diff --git a/textproc/rubygem-gitlab-glfm-markdown/Makefile b/textproc/rubygem-gitlab-glfm-markdown/Makefile
index 3ee2b0436529..dc5639b48de9 100644
--- a/textproc/rubygem-gitlab-glfm-markdown/Makefile
+++ b/textproc/rubygem-gitlab-glfm-markdown/Makefile
@@ -1,6 +1,5 @@
PORTNAME= gitlab-glfm-markdown
-PORTVERSION= 0.0.36
-PORTREVISION= 1
+PORTVERSION= 0.0.38
CATEGORIES= textproc rubygems
MASTER_SITES= RG
diff --git a/textproc/rubygem-gitlab-glfm-markdown/Makefile.crates b/textproc/rubygem-gitlab-glfm-markdown/Makefile.crates
index 99315910a0a9..65ccdf9eef64 100644
--- a/textproc/rubygem-gitlab-glfm-markdown/Makefile.crates
+++ b/textproc/rubygem-gitlab-glfm-markdown/Makefile.crates
@@ -12,7 +12,6 @@ CARGO_CRATES= adler2-2.0.1 \
bit-vec-0.6.3 \
bitflags-1.3.2 \
bitflags-2.9.1 \
- bumpalo-3.19.0 \
caseless-0.2.2 \
cc-1.2.27 \
cexpr-0.6.0 \
@@ -23,10 +22,9 @@ CARGO_CRATES= adler2-2.0.1 \
clap_derive-4.4.7 \
clap_lex-0.6.0 \
colorchoice-1.0.4 \
- comrak-0.43.0 \
+ comrak-0.46.0 \
crc32fast-1.4.2 \
deranged-0.4.0 \
- deunicode-1.6.2 \
either-1.15.0 \
emojis-0.6.4 \
entities-1.0.1 \
@@ -41,14 +39,14 @@ CARGO_CRATES= adler2-2.0.1 \
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 \
- log-0.4.27 \
- magnus-0.6.4 \
- magnus-macros-0.6.0 \
+ magnus-0.8.2 \
+ magnus-macros-0.8.0 \
memchr-2.7.5 \
minimal-lexical-0.2.1 \
miniz_oxide-0.8.9 \
@@ -66,25 +64,23 @@ CARGO_CRATES= adler2-2.0.1 \
proc-macro2-1.0.95 \
quick-xml-0.37.5 \
quote-1.0.40 \
- rb-sys-0.9.116 \
- rb-sys-build-0.9.116 \
- rb-sys-env-0.1.2 \
+ 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 \
- rustversion-1.0.21 \
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.8.1 \
+ serde_magnus-0.10.0 \
shell-words-1.1.0 \
shlex-1.3.0 \
siphasher-1.0.1 \
- slug-0.1.6 \
strsim-0.10.0 \
syn-2.0.104 \
syntect-5.2.0 \
@@ -102,11 +98,6 @@ CARGO_CRATES= adler2-2.0.1 \
unicode_categories-0.1.1 \
utf8parse-0.2.2 \
walkdir-2.5.0 \
- wasm-bindgen-0.2.100 \
- wasm-bindgen-backend-0.2.100 \
- wasm-bindgen-macro-0.2.100 \
- wasm-bindgen-macro-support-0.2.100 \
- wasm-bindgen-shared-0.2.100 \
winapi-util-0.1.9 \
windows-sys-0.59.0 \
windows-targets-0.52.6 \
diff --git a/textproc/rubygem-gitlab-glfm-markdown/distinfo b/textproc/rubygem-gitlab-glfm-markdown/distinfo
index df565d2d6ee7..6a26dde63f6f 100644
--- a/textproc/rubygem-gitlab-glfm-markdown/distinfo
+++ b/textproc/rubygem-gitlab-glfm-markdown/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1761544936
-SHA256 (gitlab-glfm-markdown-0.0.36.gem) = d2548815faf012a650653ca10e545d462c1f2558c6062bebf470f1b3dc79238b
-SIZE (gitlab-glfm-markdown-0.0.36.gem) = 23040
+TIMESTAMP = 1763010757
+SHA256 (gitlab-glfm-markdown-0.0.38.gem) = 8e57dd9283d655a40f6120dac0728f1d088900228977c139e3c969c756f40bc6
+SIZE (gitlab-glfm-markdown-0.0.38.gem) = 23040
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
@@ -29,8 +29,6 @@ SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c9
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/bumpalo-3.19.0.crate) = 46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43
-SIZE (rust/crates/bumpalo-3.19.0.crate) = 96414
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
@@ -51,14 +49,12 @@ SHA256 (rust/crates/clap_lex-0.6.0.crate) = 702fc72eb24e5a1e48ce58027a675bc24edd
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.43.0.crate) = 5ccfd7678fba9aff54a74a70352d952b345e568823ed9d5a92ebc8ad0adad8ea
-SIZE (rust/crates/comrak-0.43.0.crate) = 209621
+SHA256 (rust/crates/comrak-0.46.0.crate) = dc151d9c800c4fadd542c949b84c1dae6d1b424315ebcfd154e611d4f7910a97
+SIZE (rust/crates/comrak-0.46.0.crate) = 223946
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/deunicode-1.6.2.crate) = abd57806937c9cc163efc8ea3910e00a62e2aeb0b8119f1793a978088f8f6b04
-SIZE (rust/crates/deunicode-1.6.2.crate) = 172772
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
@@ -87,6 +83,8 @@ SHA256 (rust/crates/itertools-0.12.1.crate) = ba291022dbbd398a455acf126c1e341954
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
@@ -97,12 +95,10 @@ SHA256 (rust/crates/libloading-0.8.8.crate) = 07033963ba89ebaf1584d767badaa2e8fc
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/log-0.4.27.crate) = 13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94
-SIZE (rust/crates/log-0.4.27.crate) = 48120
-SHA256 (rust/crates/magnus-0.6.4.crate) = b1597ef40aa8c36be098249e82c9a20cf7199278ac1c1a1a995eeead6a184479
-SIZE (rust/crates/magnus-0.6.4.crate) = 170454
-SHA256 (rust/crates/magnus-macros-0.6.0.crate) = 5968c820e2960565f647819f5928a42d6e874551cab9d88d75e3e0660d7f71e3
-SIZE (rust/crates/magnus-macros-0.6.0.crate) = 6642
+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
@@ -137,12 +133,12 @@ SHA256 (rust/crates/quick-xml-0.37.5.crate) = 331e97a1af0bf59823e6eadffe373d7b27
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.116.crate) = 7059846f68396df83155779c75336ca24567741cb95256e6308c9fcc370e8dad
-SIZE (rust/crates/rb-sys-0.9.116.crate) = 28585
-SHA256 (rust/crates/rb-sys-build-0.9.116.crate) = ac217510df41b9ffc041573e68d7a02aaff770c49943c7494441c4b224b0ecd0
-SIZE (rust/crates/rb-sys-build-0.9.116.crate) = 24282
-SHA256 (rust/crates/rb-sys-env-0.1.2.crate) = a35802679f07360454b418a5d1735c89716bde01d35b1560fc953c1415a0b3bb
-SIZE (rust/crates/rb-sys-env-0.1.2.crate) = 9203
+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
@@ -151,8 +147,6 @@ SHA256 (rust/crates/regex-syntax-0.8.5.crate) = 2b15c43186be67a4fd63bee50d0303af
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/rustversion-1.0.21.crate) = 8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d
-SIZE (rust/crates/rustversion-1.0.21.crate) = 21001
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
@@ -165,16 +159,14 @@ SHA256 (rust/crates/serde_derive-1.0.219.crate) = 5b0276cf7f2c73365f7157c8123c21
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.8.1.crate) = 76c20da583b5e1016e9199ef5f3260f7a8d1b253307d232600f6b12737262dbd
-SIZE (rust/crates/serde_magnus-0.8.1.crate) = 12809
+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/slug-0.1.6.crate) = 882a80f72ee45de3cc9a5afeb2da0331d58df69e4e7d8eeb5d3c7784ae67e724
-SIZE (rust/crates/slug-0.1.6.crate) = 6787
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
@@ -209,16 +201,6 @@ SHA256 (rust/crates/utf8parse-0.2.2.crate) = 06abde3611657adf66d383f00b093d7faec
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/wasm-bindgen-0.2.100.crate) = 1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5
-SIZE (rust/crates/wasm-bindgen-0.2.100.crate) = 48288
-SHA256 (rust/crates/wasm-bindgen-backend-0.2.100.crate) = 2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6
-SIZE (rust/crates/wasm-bindgen-backend-0.2.100.crate) = 32111
-SHA256 (rust/crates/wasm-bindgen-macro-0.2.100.crate) = 7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407
-SIZE (rust/crates/wasm-bindgen-macro-0.2.100.crate) = 9663
-SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.100.crate) = 8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de
-SIZE (rust/crates/wasm-bindgen-macro-support-0.2.100.crate) = 26243
-SHA256 (rust/crates/wasm-bindgen-shared-0.2.100.crate) = 1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d
-SIZE (rust/crates/wasm-bindgen-shared-0.2.100.crate) = 8570
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
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index 88dcd2ed4e9a..aa17d4c45bb4 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1761544139
-SHA256 (go/www_gitlab-pages/gitlab-pages-v18.5.1/go.mod) = ac8a9352d8b2a358be9c716c703e89a2b1623b7abd3d9738213b2e0d50baef8b
-SIZE (go/www_gitlab-pages/gitlab-pages-v18.5.1/go.mod) = 3416
-SHA256 (go/www_gitlab-pages/gitlab-pages-v18.5.1/gitlab-pages-v18.5.1.tar.bz2) = acfc2e21f27a50102dec97ae97c23e051ff2913b6b8fae52acd11d54d0e9f461
-SIZE (go/www_gitlab-pages/gitlab-pages-v18.5.1/gitlab-pages-v18.5.1.tar.bz2) = 236838
+TIMESTAMP = 1763010408
+SHA256 (go/www_gitlab-pages/gitlab-pages-v18.5.2/go.mod) = ac8a9352d8b2a358be9c716c703e89a2b1623b7abd3d9738213b2e0d50baef8b
+SIZE (go/www_gitlab-pages/gitlab-pages-v18.5.2/go.mod) = 3416
+SHA256 (go/www_gitlab-pages/gitlab-pages-v18.5.2/gitlab-pages-v18.5.2.tar.bz2) = b46609913beaa016b08718977dab4d87bfc56a87a123aa6325f7e85d33696a20
+SIZE (go/www_gitlab-pages/gitlab-pages-v18.5.2/gitlab-pages-v18.5.2.tar.bz2) = 236830
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index 7e266cc07228..cd43c18e5307 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1761544152
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.5.1/go.mod) = 39650d5ecf720c85d09f111d574d56810f1d80074f1efb4fabac0db4c369d717
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.5.1/go.mod) = 9343
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.5.1/gitlab-foss-v18.5.1.tar.bz2) = 50f60927372f380930fc6a6b5b9bf3093c6b043ad488b8e5b941a8ca5bec5c91
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.5.1/gitlab-foss-v18.5.1.tar.bz2) = 122919401
+TIMESTAMP = 1763010422
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.5.2/go.mod) = 39650d5ecf720c85d09f111d574d56810f1d80074f1efb4fabac0db4c369d717
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.5.2/go.mod) = 9343
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.5.2/gitlab-foss-v18.5.2.tar.bz2) = 9bfd39dc3f34dec8af17f55bda6aa6217600be016e8c498804f7c3568064ee8c
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.5.2/gitlab-foss-v18.5.2.tar.bz2) = 122917718
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index bead25a6d2b7..90879977b63d 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -43,12 +43,13 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
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>=7.1.5.1<7.2:www/rubygem-rails-gitlab \
+ 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>=1.18.6<1.19:devel/rubygem-bootsnap \
rubygem-ffi>=1.17.2<2:devel/rubygem-ffi \
- rubygem-openssl>=3.3.1<4:security/rubygem-openssl \
+ rubygem-openssl>=3.3.2<4:security/rubygem-openssl \
rubygem-gitlab-secret_detection>=0.35.1<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 \
@@ -162,12 +163,12 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
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.36<0.1:textproc/rubygem-gitlab-glfm-markdown \
+ rubygem-gitlab-glfm-markdown>=0.0.38<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.18,3<2.3,3:www/rubygem-rack22 \
+ 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 \
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index 86f4f1e6af4a..56f0f3177b5b 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,5 +1,5 @@
-GITLAB_VERSION= 18.5.1
-GITLAB_PORTREVISION= 2
+GITLAB_VERSION= 18.5.2
+GITLAB_PORTREVISION= 0
# Git version gitaly should use (from gitlab mirror)
# Find current tag from Makefile and .gitlab-ci.yaml
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index 45bec2af3123..3032f717c2d3 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1761544051
-SHA256 (gitlab-foss-v18.5.1.tar.bz2) = 50f60927372f380930fc6a6b5b9bf3093c6b043ad488b8e5b941a8ca5bec5c91
-SIZE (gitlab-foss-v18.5.1.tar.bz2) = 122919401
-TIMESTAMP = 1761544091
-SHA256 (gitlab-v18.5.1-ee.tar.bz2) = e272ef2b363f2d5ba20b3a01eac3f17c07a193dbb453613d139a9400cb600e72
-SIZE (gitlab-v18.5.1-ee.tar.bz2) = 139335454
+TIMESTAMP = 1763010355
+SHA256 (gitlab-foss-v18.5.2.tar.bz2) = 9bfd39dc3f34dec8af17f55bda6aa6217600be016e8c498804f7c3568064ee8c
+SIZE (gitlab-foss-v18.5.2.tar.bz2) = 122917718
+TIMESTAMP = 1763010399
+SHA256 (gitlab-v18.5.2-ee.tar.bz2) = 3b281a0ee6b170de3befa46db60ac8b0da7663ac3b55225576741c947242d85b
+SIZE (gitlab-v18.5.2-ee.tar.bz2) = 139293550
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index d221500c3dda..f995a6f85547 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,6 +1,6 @@
---- Gemfile.orig 2025-10-21 19:12:22 UTC
+--- Gemfile.orig 2025-11-11 08:08:24 UTC
+++ Gemfile
-@@ -166,7 +166,7 @@ gem 'graphql', '2.5.11', feature_category: :api
+@@ -169,7 +169,7 @@ gem 'graphql', '2.5.11', feature_category: :api
# GraphQL API
gem 'graphql', '2.5.11', feature_category: :api
@@ -9,7 +9,7 @@
gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api
# Cells
-@@ -296,7 +296,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature
+@@ -299,7 +299,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature
gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared
# Background jobs
@@ -18,7 +18,7 @@
gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability
gem 'gitlab-sidekiq-fetcher',
path: 'vendor/gems/sidekiq-reliable-fetch',
-@@ -474,141 +474,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared
+@@ -477,141 +477,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared
gem 'warning', '~> 1.5.0', feature_category: :shared
@@ -107,7 +107,7 @@
-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', '~> 2.1.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
-
@@ -160,7 +160,7 @@
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
-@@ -642,7 +516,7 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside
+@@ -645,7 +519,7 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside
gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat
# Gitaly GRPC protocol definitions
@@ -169,7 +169,7 @@
# KAS GRPC protocol definitions
gem 'gitlab-kas-grpc', '~> 18.5.0-rc4', feature_category: :deployment_management
-@@ -668,7 +542,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :
+@@ -671,7 +545,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :
gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :shared
# Countries list
@@ -178,7 +178,7 @@
gem 'retriable', '~> 3.1.2', feature_category: :shared
-@@ -753,10 +627,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
+@@ -756,10 +630,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
gem 'duo_api', '~> 1.3', feature_category: :system_access