diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2023-01-01 06:01:43 +0000 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2023-01-01 07:09:35 +0000 |
| commit | 666fb21358a8f751f0f573f7d25b75eb0010211b (patch) | |
| tree | 10e389052592dbf9b65e0026777bda78e9e8a6dc | |
| parent | f2c3e16fe0053ea102d966635f7ce93bf9c273eb (diff) | |
| download | ports-666fb21358a8f751f0f573f7d25b75eb0010211b.tar.gz ports-666fb21358a8f751f0f573f7d25b75eb0010211b.zip | |
www/gitlab-ce: allow usage of rails 6.1.7
This fixes the change introduced by a041be369883d6cb11f2b13060a9999377116557
| -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 cdf41ad8aab1..79851f69a313 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitlab-ce PORTVERSION= 15.5.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -26,7 +26,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.6.1<6.1.7:www/rubygem-rails61 \ + rubygem-rails61>=6.1.6.1<6.1.8:www/rubygem-rails61 \ rubygem-bootsnap112>=1.12.0<1.13:devel/rubygem-bootsnap112 \ rubygem-openssl221>=2.2.1<2.2.2:security/rubygem-openssl221 \ rubygem-ipaddr122>=1.2.2<1.2.3:net/rubygem-ipaddr122 \ diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index 62c17df1e4f9..95199f7b202c 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,5 +1,14 @@ --- Gemfile.orig 2022-12-07 19:22:40 UTC +++ Gemfile +@@ -13,7 +13,7 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems + # NOTE: When incrementing the major or minor version here, also increment activerecord_version + # in vendor/gems/attr_encrypted/attr_encrypted.gemspec until we resolve + # https://gitlab.com/gitlab-org/gitlab/-/issues/375713 +-gem 'rails', '~> 6.1.6.1' ++gem 'rails', '~> 6.1.6' + + gem 'bootsnap', '~> 1.13.0', require: false + @@ -57,18 +57,18 @@ gem 'doorkeeper-openid_connect', '~> 1.7.5' gem 'rexml', '~> 3.2.5' gem 'ruby-saml', '~> 1.13.0' |