Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 20 Feb 2026 17:30:34 +0000
From:      Matthias Fechner <mfechner@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 7c2e5a196d74 - main - www/gitlab: fix conflict with rubygem-rails-html-sanitizer
Message-ID:  <69989a3a.3ad8b.33106e91@gitrepo.freebsd.org>
index | next in thread | raw e-mail 

The branch main has been updated by mfechner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7c2e5a196d747a1a634f7af2aba16882560aa72d

commit 7c2e5a196d747a1a634f7af2aba16882560aa72d
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2026-02-20 11:18:30 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2026-02-20 17:13:13 +0000

    www/gitlab: fix conflict with rubygem-rails-html-sanitizer
---
 devel/rubygem-actionview-gitlab/Makefile | 3 ++-
 www/rubygem-actionpack-gitlab/Makefile   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/devel/rubygem-actionview-gitlab/Makefile b/devel/rubygem-actionview-gitlab/Makefile
index 66074dc47686..7b94f837e5bf 100644
--- a/devel/rubygem-actionview-gitlab/Makefile
+++ b/devel/rubygem-actionview-gitlab/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	actionview
 PORTVERSION=	${RAILS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-gitlab
@@ -17,7 +18,7 @@ RUN_DEPENDS=	rubygem-activesupport-gitlab>=${PORTVERSION}<${PORTVERSION}_99:deve
 		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
+		rubygem-rails-html-sanitizer-gitlab>=1.6<2:textproc/rubygem-rails-html-sanitizer-gitlab
 
 USES=		cpe gem
 
diff --git a/www/rubygem-actionpack-gitlab/Makefile b/www/rubygem-actionpack-gitlab/Makefile
index 8f195135e558..a7cbebf7f169 100644
--- a/www/rubygem-actionpack-gitlab/Makefile
+++ b/www/rubygem-actionpack-gitlab/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	actionpack
 PORTVERSION=	${RAILS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-gitlab
@@ -21,7 +22,7 @@ RUN_DEPENDS=	rubygem-actionview-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/r
 		rubygem-rack-session10>=1.0.1:www/rubygem-rack-session10 \
 		rubygem-rack-test>=0.6.3:www/rubygem-rack-test \
 		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 \
+		rubygem-rails-html-sanitizer-gitlab>=1.6<2:textproc/rubygem-rails-html-sanitizer-gitlab \
 		rubygem-useragent>=0.16<1:devel/rubygem-useragent
 
 USES=		gem
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69989a3a.3ad8b.33106e91>