From nobody Sun Jan 01 07:09:45 2023 X-Original-To: dev-commits-ports-all@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 4Nl99P52Tvz2nvYl; Sun, 1 Jan 2023 07:09:45 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Nl99P4Tbfz3kL1; Sun, 1 Jan 2023 07:09:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672556985; 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=oeFPKcVWLpJGznD7Pyhts8LKnAKhsV+Cd0qfGSUq/4o=; b=emWfO2BJoC0dcnaI35m6XPB9vo97Etoo8Btr1HuxOwBwUR0t0rolfkDCZBQAo5SdqF4rZ7 4dqKV3ZqJYDZ/22bgr7H1yLYx2TFF73oSHnfgUOWFmvZcZjpvApusC7JfeaPCiIoJWtx3A aRoUy1c7UOVymwh0CgfwvZ8RmxXYobv6/crUrlk9D6F/gxywM4LwbhITt2Cjvks/WyJFhs PzeG/GXS3ZjF3zkXDXiaPYrLKM9Sp/mdt6uUJnl1Fn2tLMWc+tSqOGqKu3p8qcepPa7rFa MuUfbD++THRAdbJyaTvvFpbz9hjUuihWM9+ERGZRCytpUiJobijmXRavYR6lkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672556985; 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=oeFPKcVWLpJGznD7Pyhts8LKnAKhsV+Cd0qfGSUq/4o=; b=gd0RW1n1mftsSEBJJa3yNT+5Su1/UmguXejtXulh8rzmEjlIHVubWLQLyHW9j8tqSVAFAy rSmIM3b3rPQuaVlRqw+S3ZOMzywbIrIvA8kWt4tSZM7d/skzo57UvIVMwPKejYlJl8uqbt EulfkPN2VXXI0Xlf6dGpycmIL81KP8fZfRshpjVEOukXWUuzQYz6qvd3rMXrxSCq2PoOFW tsS5kXjfOkDJofvca9QRonIc/Uuk58UKnnWw/9Xof1C0U+QkcMSkQOVK4VV7PDQufMEXgX Z7yFaObqH/pHZsnWKMTsP0DXKiDlEy8a75Dbcwf7BdItze/JFNaanjZfVCxIew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672556985; a=rsa-sha256; cv=none; b=cw1JrKz9g9qqL64pDcQlSI8ljNu2euKp9hMvRLEz5i2zjcpARoIV6GbJbaJMF0mxps760M XLFZjA5tU5Hg4BldZOqfmif7l3HHl+D6mrNkeC56qI5u+iygZJCda9LhAfhWsInrIVv9/0 nPXGcBw+TPuVFS0IuxCy+n0RjDo+BY6uqpSqAH1MnZagwZM/WjaUNYCJPV4hG/7tUy4Ucf FEhN2bY2xqrSuMUGoA80tyu7xMM/Pqvr+47f0hvzjx9SjkyPNj5g+pe2cRuCRREXXQNd70 Mas2hkHoHQ81SUOB9tbtCZgsXAT1n3myI0px+xbyu2q+q7qJcEMzRak3qS0bLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Nl99P3XrXzJbZ; Sun, 1 Jan 2023 07:09:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30179jZI072257; Sun, 1 Jan 2023 07:09:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30179jZQ072256; Sun, 1 Jan 2023 07:09:45 GMT (envelope-from git) Date: Sun, 1 Jan 2023 07:09:45 GMT Message-Id: <202301010709.30179jZQ072256@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: 666fb21358a8 - main - www/gitlab-ce: allow usage of rails 6.1.7 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 666fb21358a8f751f0f573f7d25b75eb0010211b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=666fb21358a8f751f0f573f7d25b75eb0010211b commit 666fb21358a8f751f0f573f7d25b75eb0010211b Author: Matthias Fechner AuthorDate: 2023-01-01 06:01:43 +0000 Commit: Matthias Fechner CommitDate: 2023-01-01 07:09:35 +0000 www/gitlab-ce: allow usage of rails 6.1.7 This fixes the change introduced by a041be369883d6cb11f2b13060a9999377116557 --- www/gitlab-ce/Makefile | 4 ++-- www/gitlab-ce/files/patch-Gemfile | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index cdf41ad8aab1..79851f69a313 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitlab-ce PORTVERSION= 15.5.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -26,7 +26,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ yarn>=1.10.0:www/yarn \ gtar>0:archivers/gtar \ bash>0:shells/bash \ - rubygem-rails61>=6.1.6.1<6.1.7:www/rubygem-rails61 \ + rubygem-rails61>=6.1.6.1<6.1.8:www/rubygem-rails61 \ rubygem-bootsnap112>=1.12.0<1.13:devel/rubygem-bootsnap112 \ rubygem-openssl221>=2.2.1<2.2.2:security/rubygem-openssl221 \ rubygem-ipaddr122>=1.2.2<1.2.3:net/rubygem-ipaddr122 \ diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index 62c17df1e4f9..95199f7b202c 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,5 +1,14 @@ --- Gemfile.orig 2022-12-07 19:22:40 UTC +++ Gemfile +@@ -13,7 +13,7 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems + # NOTE: When incrementing the major or minor version here, also increment activerecord_version + # in vendor/gems/attr_encrypted/attr_encrypted.gemspec until we resolve + # https://gitlab.com/gitlab-org/gitlab/-/issues/375713 +-gem 'rails', '~> 6.1.6.1' ++gem 'rails', '~> 6.1.6' + + gem 'bootsnap', '~> 1.13.0', require: false + @@ -57,18 +57,18 @@ gem 'doorkeeper-openid_connect', '~> 1.7.5' gem 'rexml', '~> 3.2.5' gem 'ruby-saml', '~> 1.13.0'