www/gitlab: major upgrade to 18.6

Changes:	https://about.gitlab.com/releases/2025/11/20/gitlab-18-6-released/

8 files changed, 29 insertions, 25 deletions

diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 751c46613f9e..f695543637b8 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -26,7 +26,8 @@ CPE_VENDOR=	gitlab
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 GL_TUPLE=	gitlab-org:git:v${GITLAB_GIT_VERSION}:git_dep/_build/deps/git-v${GITLAB_GIT_VERSION_SHORT} \
-		gitlab-org:git:${GITLAB_GIT_MASTER_VERSION}:git_master_dep/_build/deps/git-master
+		gitlab-org:git:${GITLAB_GIT_MASTER_VERSION}:git_master_dep/_build/deps/git-master \
+		gitlab-org:git:${GITLAB_GIT_PREV_VERSION}:git_prev_dep/_build/deps/git-prev
 
 GO_MOD_DIST=	gitlab
 GO_MODULE=	gitlab.com/gitlab-org/gitaly/v18
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 2d8fd76d3a5a..ef1184d177eb 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,9 +1,11 @@
-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
+TIMESTAMP = 1763615394
+SHA256 (go/devel_gitaly/gitaly-v18.6.0/go.mod) = 1aace7ab09969668d9aad9416851833a2ec122442b060ce133e60d1d7c9b0252
+SIZE (go/devel_gitaly/gitaly-v18.6.0/go.mod) = 14044
+SHA256 (go/devel_gitaly/gitaly-v18.6.0/gitaly-v18.6.0.tar.bz2) = d182251c770cc67e1def2d621ad51415717d8ca093df87d357e918dcf56cefdf
+SIZE (go/devel_gitaly/gitaly-v18.6.0/gitaly-v18.6.0.tar.bz2) = 4657060
+SHA256 (go/devel_gitaly/gitaly-v18.6.0/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4
+SIZE (go/devel_gitaly/gitaly-v18.6.0/git-v2.50.0.tar.bz2) = 9249878
+SHA256 (go/devel_gitaly/gitaly-v18.6.0/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = d3397b210ca156ed84ff69b3a7f6316c5026bd05d11455f23d8335473dceaf1b
+SIZE (go/devel_gitaly/gitaly-v18.6.0/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = 11822923
+SHA256 (go/devel_gitaly/gitaly-v18.6.0/gitlab-org-git-23466173824c0a0f835c0d790c2f38156ae6284a_GL0.tar.gz) = 01a4069b15e9262151b3b97f989d4939ba8966bd5269875add2a34806817c01a
+SIZE (go/devel_gitaly/gitaly-v18.6.0/gitlab-org-git-23466173824c0a0f835c0d790c2f38156ae6284a_GL0.tar.gz) = 11745131
diff --git a/devel/rubygem-actionview-gitlab/Makefile b/devel/rubygem-actionview-gitlab/Makefile
index 992e2ceab740..32827b1fe883 100644
--- a/devel/rubygem-actionview-gitlab/Makefile
+++ b/devel/rubygem-actionview-gitlab/Makefile
@@ -14,16 +14,17 @@ LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
 RUN_DEPENDS=	rubygem-activesupport-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport-gitlab \
 		rubygem-builder>=3.1<4:devel/rubygem-builder \
+		rubygem-cgi>=0:www/rubygem-cgi \
 		rubygem-erubi>=1.11<2:www/rubygem-erubi \
 		rubygem-rails-dom-testing-rails-gitlab>=2.2<3:textproc/rubygem-rails-dom-testing-rails-gitlab \
 		rubygem-rails-html-sanitizer>=1.6<2:textproc/rubygem-rails-html-sanitizer
 
 USES=		cpe gem
 
-NO_ARCH=	yes
-
 CPE_VENDOR=	rubyonrails
 
+NO_ARCH=	yes
+
 PORTSCOUT=	limit:^7\.1\.
 
 .include "${.CURDIR}/../../www/gitlab/Makefile.common"
diff --git a/devel/rubygem-actionview-gitlab/distinfo b/devel/rubygem-actionview-gitlab/distinfo
index e7c119f2cd6d..48580e7ec0fb 100644
--- a/devel/rubygem-actionview-gitlab/distinfo
+++ b/devel/rubygem-actionview-gitlab/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1755146398
-SHA256 (rubygem/actionview-7.1.5.2.gem) = 4fc916ac7eac631e228955207b1730935a7944a4d87d45a32cc40e977d5ca1c9
-SIZE (rubygem/actionview-7.1.5.2.gem) = 188416
+TIMESTAMP = 1763614436
+SHA256 (rubygem/actionview-7.1.6.gem) = 11147d81f90465ae062b2a77805c6f8f446e044e309c51bd9449bdbd43edf566
+SIZE (rubygem/actionview-7.1.6.gem) = 188416
diff --git a/devel/rubygem-activejob-gitlab/Makefile b/devel/rubygem-activejob-gitlab/Makefile
index e7d9e5c7550f..ea3ba2cbb0e7 100644
--- a/devel/rubygem-activejob-gitlab/Makefile
+++ b/devel/rubygem-activejob-gitlab/Makefile
@@ -17,11 +17,11 @@ RUN_DEPENDS=	rubygem-activesupport-gitlab>=${PORTVERSION}<${PORTVERSION}_99:deve
 
 USES=		cpe gem
 
-NO_ARCH=	yes
-
 CPE_VENDOR=	rubyonrails
 CPE_PRODUCT=	active_job
 
+NO_ARCH=	yes
+
 PORTSCOUT=	limit:^7\.1\.
 
 .include "${.CURDIR}/../../www/gitlab/Makefile.common"
diff --git a/devel/rubygem-activejob-gitlab/distinfo b/devel/rubygem-activejob-gitlab/distinfo
index 8b9ed3194a20..5b948bf8f252 100644
--- a/devel/rubygem-activejob-gitlab/distinfo
+++ b/devel/rubygem-activejob-gitlab/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1755146399
-SHA256 (rubygem/activejob-7.1.5.2.gem) = afb662a5c5cda81e34fe6b09089cdf4084aabc27c6aedbd58ba4c1bef7bd804e
-SIZE (rubygem/activejob-7.1.5.2.gem) = 37376
+TIMESTAMP = 1763614436
+SHA256 (rubygem/activejob-7.1.6.gem) = 0dd9cd051d494608349dd9223a3e61c3933250db77e35ab6617c26c1d52dccbb
+SIZE (rubygem/activejob-7.1.6.gem) = 37376
diff --git a/devel/rubygem-activesupport-gitlab/Makefile b/devel/rubygem-activesupport-gitlab/Makefile
index 87203593c575..98841a6c947c 100644
--- a/devel/rubygem-activesupport-gitlab/Makefile
+++ b/devel/rubygem-activesupport-gitlab/Makefile
@@ -27,10 +27,10 @@ RUN_DEPENDS=	rubygem-base64>=0:converters/rubygem-base64 \
 
 USES=		cpe gem
 
-NO_ARCH=	yes
-
 CPE_VENDOR=	activesupport_project
 
+NO_ARCH=	yes
+
 PORTSCOUT=	limit:^7\.1\.
 
 .include "${.CURDIR}/../../www/gitlab/Makefile.common"
diff --git a/devel/rubygem-activesupport-gitlab/distinfo b/devel/rubygem-activesupport-gitlab/distinfo
index 1fea5c20432a..0f993ff744fd 100644
--- a/devel/rubygem-activesupport-gitlab/distinfo
+++ b/devel/rubygem-activesupport-gitlab/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1755146400
-SHA256 (rubygem/activesupport-7.1.5.2.gem) = 900031b9c8acbfea604977addcbfe990ba8f36e1059e9d448df520bbead36ed1
-SIZE (rubygem/activesupport-7.1.5.2.gem) = 258560
+TIMESTAMP = 1763614438
+SHA256 (rubygem/activesupport-7.1.6.gem) = 7f12140a813b1c4922a322663e547129aef1840fc512fa262378f6d7e7fd3a7c
+SIZE (rubygem/activesupport-7.1.6.gem) = 258560