git: 3bd1f5991485 - main - www/gitlab: use nodejs 24 for asset compilation

The branch main has been updated by mfechner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3bd1f59914854acd7148880f54771967a7a9919c

commit 3bd1f59914854acd7148880f54771967a7a9919c
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2026-03-25 06:52:07 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2026-03-25 07:12:38 +0000

    www/gitlab: use nodejs 24 for asset compilation
---
 devel/rubygem-execjs-gitlab/Makefile | 3 ++-
 www/gitlab/Makefile                  | 5 +----
 www/gitlab/Makefile.common           | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/devel/rubygem-execjs-gitlab/Makefile b/devel/rubygem-execjs-gitlab/Makefile
index 7cda9ad1171f..e2b2ded644ea 100644
--- a/devel/rubygem-execjs-gitlab/Makefile
+++ b/devel/rubygem-execjs-gitlab/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	execjs
 PORTVERSION=	2.10.0
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-gitlab
@@ -11,7 +12,7 @@ WWW=		https://github.com/rails/execjs
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-USES=		gem nodejs:run,20
+USES=		gem nodejs:run
 
 NO_ARCH=	yes
 
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 05b1a9502a07..d79c8461e320 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -27,9 +27,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 # 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
-# Gitlab does not work with nodejs 24, but keep it here for a later upgrade
-# yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX}
 MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	gitlab-elasticsearch-indexer>=5.13.3:textproc/gitlab-elasticsearch-indexer \
 	gitlab-agent>=${GITLAB_VERSION}:net/gitlab-agent \
@@ -38,7 +35,7 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	gitlab-workhorse>=${GITLAB_VERSION}:www/gitlab-workhorse \
 	gitlab-zoekt-indexer>=1.11.0:textproc/gitlab-zoekt-indexer \
 	redis>=6.2.11:databases/redis \
-	yarn-node20>=1.10.0:www/yarn-node20 \
+	yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} \
 	gtar>0:archivers/gtar \
 	bash>0:shells/bash \
 	rubygem-parser>=3.3.10.1:devel/rubygem-parser \
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index 330260258753..6092a78c0e7b 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,5 +1,5 @@
 GITLAB_VERSION=		18.10.0
-GITLAB_PORTREVISION=	4	# decrease this only if GITLAB_KAS_GRPC_VERSION is upgraded
+GITLAB_PORTREVISION=	5	# 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