diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2023-01-01 06:29:05 +0000 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2023-01-01 07:09:36 +0000 |
| commit | 87a1ca93449a1b28c231161082b9402e10844a67 (patch) | |
| tree | 93a43c97b4fb1e93111bbe1c97c5ea9f338533ec | |
| parent | 666fb21358a8f751f0f573f7d25b75eb0010211b (diff) | |
| download | ports-87a1ca93449a1b28c231161082b9402e10844a67.tar.gz ports-87a1ca93449a1b28c231161082b9402e10844a67.zip | |
www/gitlab-ce: Unbreak build
Break was introduced by aaa945714f7184e527915c4fce6ab37f33e0ac39
| -rw-r--r-- | www/gitlab-ce/Makefile | 4 | ||||
| -rw-r--r-- | www/gitlab-ce/files/patch-Gemfile | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 79851f69a313..b722a1f087ae 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitlab-ce PORTVERSION= 15.5.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -27,7 +27,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ gtar>0:archivers/gtar \ bash>0:shells/bash \ rubygem-rails61>=6.1.6.1<6.1.8:www/rubygem-rails61 \ - rubygem-bootsnap112>=1.12.0<1.13:devel/rubygem-bootsnap112 \ + rubygem-bootsnap>=1.13.0<1.15:devel/rubygem-bootsnap \ rubygem-openssl221>=2.2.1<2.2.2:security/rubygem-openssl221 \ rubygem-ipaddr122>=1.2.2<1.2.3:net/rubygem-ipaddr122 \ rubygem-responders-rails61>=3.0<4.0:www/rubygem-responders-rails61 \ diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index 95199f7b202c..85b35e8e80a5 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,14 +1,17 @@ --- Gemfile.orig 2022-12-07 19:22:40 UTC +++ Gemfile -@@ -13,7 +13,7 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems +@@ -13,9 +13,9 @@ 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 +-gem 'bootsnap', '~> 1.13.0', require: false ++gem 'bootsnap', '~> 1.14.0', require: false + # Pin openssl to match the version bundled with our supported Rubies. + # See https://stdgems.org/openssl/#gem-version. @@ -57,18 +57,18 @@ gem 'doorkeeper-openid_connect', '~> 1.7.5' gem 'rexml', '~> 3.2.5' gem 'ruby-saml', '~> 1.13.0' |