From owner-svn-ports-all@freebsd.org Sat Mar 28 22:31:20 2020 Return-Path: Delivered-To: svn-ports-all@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 15C4426904B; Sat, 28 Mar 2020 22:31:20 +0000 (UTC) (envelope-from mfechner@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48qYNR4hhgz4SPF; Sat, 28 Mar 2020 22:31:19 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9D0471CD63; Sat, 28 Mar 2020 22:31:10 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02SMVA5s091963; Sat, 28 Mar 2020 22:31:10 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02SMV9Rb091960; Sat, 28 Mar 2020 22:31:09 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <202003282231.02SMV9Rb091960@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Sat, 28 Mar 2020 22:31:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529764 - in head: devel/gitaly devel/gitaly/files www/gitlab-ce X-SVN-Group: ports-head X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: in head: devel/gitaly devel/gitaly/files www/gitlab-ce X-SVN-Commit-Revision: 529764 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Mar 2020 22:31:20 -0000 Author: mfechner Date: Sat Mar 28 22:31:09 2020 New Revision: 529764 URL: https://svnweb.freebsd.org/changeset/ports/529764 Log: Fix Gemfile for rubygem-rails60 6.0.2.2 update. Modified: head/devel/gitaly/Makefile head/devel/gitaly/files/patch-ruby_Gemfile head/www/gitlab-ce/Makefile Modified: head/devel/gitaly/Makefile ============================================================================== --- head/devel/gitaly/Makefile Sat Mar 28 21:05:11 2020 (r529763) +++ head/devel/gitaly/Makefile Sat Mar 28 22:31:09 2020 (r529764) @@ -2,7 +2,7 @@ PORTNAME= gitaly DISTVERSION= 12.9.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org @@ -17,7 +17,7 @@ MY_DEPENDS= git>=2.22:devel/git \ rubygem-rugged>=0.28<1.0:devel/rubygem-rugged \ rubygem-github-linguist>=7.5<8.0:textproc/rubygem-github-linguist \ rubygem-gitlab-markup>=1.7.0<1.8.0:textproc/rubygem-gitlab-markup \ - rubygem-activesupport60>=6.0.2.1<6.1:devel/rubygem-activesupport60 \ + rubygem-activesupport60=6.0.2.2:devel/rubygem-activesupport60 \ rubygem-rdoc>=6.1<7.0:devel/rubygem-rdoc \ rubygem-gitlab-gollum-lib>=4.2.7.8<4.2.8.0:www/rubygem-gitlab-gollum-lib \ rubygem-gitlab-gollum-rugged_adapter>=0.4.4.2<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \ Modified: head/devel/gitaly/files/patch-ruby_Gemfile ============================================================================== --- head/devel/gitaly/files/patch-ruby_Gemfile Sat Mar 28 21:05:11 2020 (r529763) +++ head/devel/gitaly/files/patch-ruby_Gemfile Sat Mar 28 22:31:09 2020 (r529764) @@ -1,13 +1,13 @@ ---- ruby/Gemfile.orig 2020-03-26 12:14:07 UTC +--- ruby/Gemfile.orig 2020-03-26 12:14:05 UTC +++ ruby/Gemfile @@ -6,7 +6,7 @@ gem 'bundler', '>= 1.17.3' gem 'rugged', '~> 0.28' gem 'github-linguist', '~> 7.5', require: 'linguist' gem 'gitlab-markup', '~> 1.7.0' -gem 'activesupport', '6.0.2' -+gem 'activesupport', '6.0.2.1' ++gem 'activesupport', '6.0.2.2' gem 'rdoc', '~> 6.0' - gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false + gem 'gitlab-gollum-lib', '~> 4.2.7.8', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false @@ -16,7 +16,7 @@ gem 'faraday', '~> 0.12' gem 'rbtrace', require: false Modified: head/www/gitlab-ce/Makefile ============================================================================== --- head/www/gitlab-ce/Makefile Sat Mar 28 21:05:11 2020 (r529763) +++ head/www/gitlab-ce/Makefile Sat Mar 28 22:31:09 2020 (r529764) @@ -21,7 +21,7 @@ MY_DEPENDS= git>=2.22.2:devel/git \ gitlab-pages>=1.17.0:www/gitlab-pages \ redis>=3.2.12:databases/redis \ yarn>=1.10.0:www/yarn \ - rubygem-rails60>=6.0.2.2<6.0.3:www/rubygem-rails60 \ + rubygem-rails60=6.0.2.2:www/rubygem-rails60 \ rubygem-bootsnap>=1.4.6<2.0:devel/rubygem-bootsnap \ rubygem-nakayoshi_fork>=0.0.4<0.1.0:devel/rubygem-nakayoshi_fork \ rubygem-responders-rails60>=3.0<4.0:www/rubygem-responders-rails60 \