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

www/gitlab-ce: Revert unapproved modification that broke gitlab 

(cherry picked from commit 7dcb3ca590)
This commit is contained in:
Matthias Fechner 2021-10-05 07:45:30 +02:00
parent 4bd91403b4
commit 1cc165530a
4 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/gitaly/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= gitaly
DISTVERSION= 14.3.2
PORTREVISION= 0
PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= mfechner@FreeBSD.org
@ -15,7 +15,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \
rubygem-rugged>=1.1<2:devel/rubygem-rugged \
rubygem-github-linguist>=7.12.1<8:textproc/rubygem-github-linguist \
rubygem-gitlab-markup>=1.7.1<1.8.0:textproc/rubygem-gitlab-markup \
rubygem-activesupport61>=6.1.3.2<6.2:devel/rubygem-activesupport61 \
rubygem-activesupport61>=6.1.3.2<6.1.4:devel/rubygem-activesupport61 \
rubygem-rdoc>=6.3.2<7.0:devel/rubygem-rdoc \
rubygem-gitlab-gollum-lib>=4.2.7.10.gitlab.1<4.2.8:www/rubygem-gitlab-gollum-lib \
rubygem-gitlab-gollum-rugged_adapter>=0.4.4.4.gitlab.1<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \

9
devel/gitaly/files/patch-ruby_Gemfile
View File

@ -1,11 +1,6 @@
--- ruby/Gemfile.orig 2021-09-21 10:03:53 UTC
--- ruby/Gemfile.orig 2021-08-31 13:54:28 UTC
+++ ruby/Gemfile
@@ -3,31 +3,20 @@ source 'https://rubygems.org'
gem 'rugged', '~> 1.1'
gem 'github-linguist', '~> 7.12', require: 'linguist'
gem 'gitlab-markup', '~> 1.7.1'
-gem 'activesupport', '~> 6.1.3.2'
+gem 'activesupport', '>= 6.1.3.2', '< 6.2'
@@ -7,27 +7,16 @@ gem 'activesupport', '~> 6.1.3.2'
gem 'rdoc', '~> 6.0'
gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.1', require: false
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false

2
www/gitlab-ce/Makefile
View File

@ -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.2:www/rubygem-rails61 \
rubygem-rails61>=6.1.3.2<6.1.4: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 \

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

@ -1,14 +1,5 @@
--- Gemfile.orig 2021-09-21 10:06:28 UTC
--- Gemfile.orig 2021-10-01 16:06:26 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