svn commit: r529764 - in head: devel/gitaly devel/gitaly/files www/gitlab-ce

[Matthias Fechner]

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 at 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 \