diff options
| author | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2021-09-27 15:45:30 +0000 |
|---|---|---|
| committer | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2021-09-27 15:56:30 +0000 |
| commit | bb4b4cf9ca48617f4dc8f888ee65e0717637ccd0 (patch) | |
| tree | 3a76a333f989926ef5184113feceb26f9678f98a | |
| parent | c59be564611c45e48351155e62ad23134407a6e5 (diff) | |
| download | ports-bb4b4cf9ca48617f4dc8f888ee65e0717637ccd0.tar.gz ports-bb4b4cf9ca48617f4dc8f888ee65e0717637ccd0.zip | |
www/gitlab-ce: Fix Gemfile for rubygem-rails61 6.1.4.1 update
- Bump PORTREVISION for package change
| -rw-r--r-- | www/gitlab-ce/Makefile | 4 | ||||
| -rw-r--r-- | 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 |