From owner-dev-commits-ports-main@freebsd.org Mon Sep 27 16:01:42 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D22A7668CF7; Mon, 27 Sep 2021 16:01:42 +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 4HJ6nx2J8Yz3nD3; Mon, 27 Sep 2021 16:01:40 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 533C614095; Mon, 27 Sep 2021 16:01:34 +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 18RG1XXb047304; Mon, 27 Sep 2021 16:01:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18RG1XuB047303; Mon, 27 Sep 2021 16:01:33 GMT (envelope-from git) Date: Mon, 27 Sep 2021 16:01:33 GMT Message-Id: <202109271601.18RG1XuB047303@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: bb4b4cf9ca48 - main - www/gitlab-ce: Fix Gemfile for rubygem-rails61 6.1.4.1 update MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb4b4cf9ca48617f4dc8f888ee65e0717637ccd0 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Sep 2021 16:01:43 -0000 The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=bb4b4cf9ca48617f4dc8f888ee65e0717637ccd0 commit bb4b4cf9ca48617f4dc8f888ee65e0717637ccd0 Author: Po-Chuan Hsieh AuthorDate: 2021-09-27 15:45:30 +0000 Commit: Po-Chuan Hsieh CommitDate: 2021-09-27 15:56:30 +0000 www/gitlab-ce: Fix Gemfile for rubygem-rails61 6.1.4.1 update - Bump PORTREVISION for package change --- 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 3fec018b727c..40128bca9a42 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -2,7 +2,7 @@ PORTNAME= gitlab-ce PORTVERSION= 14.3.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -24,7 +24,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.3.2<6.1.4:www/rubygem-rails61 \ + rubygem-rails61>=6.1.3.2<6.2:www/rubygem-rails61 \ rubygem-bootsnap14>=1.4.6<2.0:devel/rubygem-bootsnap14 \ rubygem-responders-rails61>=3.0<4.0:www/rubygem-responders-rails61 \ rubygem-sprockets3>=3.7<3.8:devel/rubygem-sprockets3 \ diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index ea879687e2dc..bf2d26d8a95e 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,5 +1,14 @@ --- Gemfile.orig 2021-09-21 10:06:28 UTC +++ Gemfile +@@ -2,7 +2,7 @@ + + source 'https://rubygems.org' + +-gem 'rails', '~> 6.1.3.2' ++gem 'rails', '>= 6.1.3.2', '< 6.2' + + gem 'bootsnap', '~> 1.4.6' + @@ -88,7 +88,7 @@ gem 'gpgme', '~> 2.0.19' # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master