From nobody Fri Feb 20 17:30:34 2026 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fHchq22rkz6Sgk7 for ; Fri, 20 Feb 2026 17:30:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fHchp6bv4z3tMJ for ; Fri, 20 Feb 2026 17:30:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771608634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ye/jS1PoVPlemRVOq9gX3hMjOm700riGDVkbpesy95s=; b=JSz/NqayVazj+04xv+Rz3zKIj17+G46zL9qwSq3bOHaOniVKOduoi4KZ9b1VOzuboOIJBD 15N9SLEq7BFmrnHH9mwSP/ag58JsF8fL5SQkfZscPqG+EMgnAOcJAvTzgv1g1cCKdWdtjC 6eo8qpOA+0cteuECfHQneP246GXEjGyiGhmTGuV5rOnbQ4PKaQbb2Lcouxegut3zXwjPZm HZ/I0Til9TCwgI9IkM62lLHY4MwW1Y0MI9Q/XsONfpBM6d0I4Cip8+VJa4L/GLmWJwIjH+ ADqxcygZR+YvHwWmWivB3LEEL058vniUszTGmvrTzmxJvd5U9aGVZE0dJaLPLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771608634; a=rsa-sha256; cv=none; b=xm/GORxlO4dOMNh/HNBVQY8/X/+YNxRtJHR9KT64KdsW1tReNNIGoHp1hXlQrICyICLpTB 5vX6CqBhjnqW0Yy0wrrMgQB+81Y38idKwltpHYzzXeqno4OT/lmPhcVOueAIJ1sKn1s2S2 UTPmO61ZqWQo+950+LGy2QYhOx8mIjx86hPbiUoJwvg5ut4n5RtmH1B6/Z+MBnttjfxRtf udSyigXEZR26gJJDSDMYsbR7wXVqIKoleVR6dR8bevjrGUDv1MHsPFrZT33XbsTelQTinz 1zNMCW42NNZqA9KyCc+/mUoKjQkn6VPeucFIN4kzEjsOVWQW7WpDL3bsSiMkZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771608634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ye/jS1PoVPlemRVOq9gX3hMjOm700riGDVkbpesy95s=; b=l1Kyug6aYUcpwbhgZ0NZqDJIzadDLibZNXxJD8QKjYj0jZRhlIKPPpGBns/EsVn1FXwNWY tWJaCcCabgcbHzG+/igwRa0Tf/0h4SAGNuloNaagSuHge6upqKc5Rio4QPArBsTWm24nA9 HQOi1cq2rzVOTejtZb0sJD/1MbnCps7H/u2mse1JxkwpJI8zmiEab+p/s5QS2U4gRA4cAs Yscv122SmjHk0/Od4FPv0zN1HldTxVJC13r4TL1pZv3YvjBHubxzdBExrr+HpdQr9piqQq diM5fY3DNTCGmhcYDBIEo6eZ7IRnOLQxonzjo74MMmpSiLpiKD9cpAUMLgn/rQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHchp68WczdLH for ; Fri, 20 Feb 2026 17:30:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ad8b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 17:30:34 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: 7c2e5a196d74 - main - www/gitlab: fix conflict with rubygem-rails-html-sanitizer List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7c2e5a196d747a1a634f7af2aba16882560aa72d Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 17:30:34 +0000 Message-Id: <69989a3a.3ad8b.33106e91@gitrepo.freebsd.org> The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=7c2e5a196d747a1a634f7af2aba16882560aa72d commit 7c2e5a196d747a1a634f7af2aba16882560aa72d Author: Matthias Fechner AuthorDate: 2026-02-20 11:18:30 +0000 Commit: Matthias Fechner 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