From nobody Thu Jun 27 04:49:51 2024 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 4W8mMM3KS2z5NpBG; Thu, 27 Jun 2024 04:49:51 +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 4W8mMM2nvwz47Xl; Thu, 27 Jun 2024 04:49:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719463791; 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=GZnrUVO4LtFhrcrnHKg5xQsHu2rjn9IrZO+ua2zjt/g=; b=aiofdRIM/3mxc+XIz7E5Q47A+TqYsIKBty5Jqybl/L37mE7NUk/HykST7t/za/oypaKbPZ zySDPxj4lEI5TdUfXN66qpZEz9iyHon37ms8MwkiXg7HpKMKrnFFqHWonOYeP/gA9q84Ft fNG9IMndpDy4XVyvW+IXWyop9Z11aaGW0XwqKoCsaAK48J0PVkvy9z6kiOq0yK+9A3b7Mx b/jLjS+xfU6Sj9ZOBUCVpDi1wg0DagRaJKtjSbvoX8yJ/9BarwiMBsWFlpKZBJHH00Itwu wef6MeGvcvdrRZoR/hnz7VrRpmczzDOSpbfDeUKmsTvt9m1M2CX7PV/opt6gGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719463791; a=rsa-sha256; cv=none; b=QzGrzkdCc5EJfMT5u/J5B7p15mFhdI8MAMT1v0jND4YmDLDdSk5tIttyVxaiqBKB1vUQGG IVgO886WlIS9tJFbS2J3m1XoS0l+FrBvj+2GICinH/qln9sMUe4v1omXsbecbaqIVsOXbG fW26Fse4dLJ9w2Lt9CGMx4XpqauofE3CTby1reWf4umLXvv2XFzdBfRjC+4pPXzuktZPGH n67Wjkolla9aX9nhhFqdE7c4dgkisbPiFZWDJQsHr+atvmMdCUNc3VRR7RYxi0kPJ4Igh+ jgRTTPwS7kVat8zuPsD6bTl8IWv/G3mbhHV0aeoeD5G0DA8OcCL7fFnBzQJiHA== 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=1719463791; 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=GZnrUVO4LtFhrcrnHKg5xQsHu2rjn9IrZO+ua2zjt/g=; b=I1KfzHRm50nLRgYhScQT2GTplg+vbxCz+xNx/VXm/VgjYgsMTYz+pVzU81etq7M8YgQtWD qF1LHfJDO1EBTOnlHpmRPoY+4wGHoRMqRtodbZ8ibJdoHXi83aDrMk1umuN0bDm22kRBwy rG6AdViMLMiZNoDzCrQu/vlOGRlFInybsvkp9h07O3jTlZLQT7VvWOgLcxzvwtfu/Feu/d 3xgoNa0UIt3CVLST5e1PrgCVNJ0dnsyRWmhQbVKOUuJQ652CONHjpJrcVNBmOzN73v7AVn Yk2V9NuW3d7nYEUbQkgCS+qDzN2imkjS5cLasBaQMzIIuVYvnUSXZxlkED1LKQ== 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 4W8mMM1NBnz1D6n; Thu, 27 Jun 2024 04:49:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45R4np1X088064; Thu, 27 Jun 2024 04:49:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45R4npEu088061; Thu, 27 Jun 2024 04:49:51 GMT (envelope-from git) Date: Thu, 27 Jun 2024 04:49:51 GMT Message-Id: <202406270449.45R4npEu088061@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: ec44878c0220 - main - www/gitlab: fix regression from 656f3fb43c1edac1b2ba32fce8a36a35f62d6daa 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: ec44878c022040ea2a2d19a0f02ee72fbdce5811 Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=ec44878c022040ea2a2d19a0f02ee72fbdce5811 commit ec44878c022040ea2a2d19a0f02ee72fbdce5811 Author: Matthias Fechner AuthorDate: 2024-06-22 16:09:47 +0000 Commit: Matthias Fechner CommitDate: 2024-06-27 04:38:59 +0000 www/gitlab: fix regression from 656f3fb43c1edac1b2ba32fce8a36a35f62d6daa Use grape 2.0 PR: 279905 --- www/gitlab/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index e3c0ba73e539..82eda55c8414 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -4,7 +4,7 @@ DISTVERSIONPREFIX= v .if ${FLAVOR:U} == ee DISTVERSIONSUFFIX= -ee .endif -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www devel # include patch to fix database migration @@ -87,7 +87,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-gpgme>=2.0.23<2.1.0:security/rubygem-gpgme \ rubygem-gitlab_omniauth-ldap>=2.2.0<2.3.0:net/rubygem-gitlab_omniauth-ldap \ rubygem-net-ldap017>=0.17.1<0.18:net/rubygem-net-ldap017 \ - rubygem-grape>=2.0.0<2.1:devel/rubygem-grape \ + rubygem-grape20>=2.0.0<2.1:devel/rubygem-grape20 \ rubygem-grape-entity>=1.0.1<1.1,1:devel/rubygem-grape-entity \ rubygem-grape-swagger20>=2.0.2<2.1:devel/rubygem-grape-swagger20 \ rubygem-grape-swagger-entity>=0.5.1<0.6:devel/rubygem-grape-swagger-entity \