cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

www/gitlab-ce: allow usage of rails 6.1.7

Browse Source 
This fixes the change introduced by a041be3698
This commit is contained in:
Matthias Fechner 2023-01-01 07:01:43 +01:00
parent f2c3e16fe0
commit 666fb21358
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/gitlab-ce/Makefile
View File

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

9
www/gitlab-ce/files/patch-Gemfile
View File

@ -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'