diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2021-10-05 05:45:30 +0000 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2021-10-05 07:40:03 +0000 |
| commit | 7dcb3ca59065e8f1c74bbed2f64f3bc8100bbc18 (patch) | |
| tree | 4738608a3fd07c5238910ada545a62a8724febe6 | |
| parent | 17acc171db1e4fd164df884e49072c91178b4831 (diff) | |
| download | ports-7dcb3ca59065e8f1c74bbed2f64f3bc8100bbc18.tar.gz ports-7dcb3ca59065e8f1c74bbed2f64f3bc8100bbc18.zip | |
www/gitlab-ce: Revert unapproved modification that broke gitlab
| -rw-r--r-- | devel/gitaly/Makefile | 4 | ||||
| -rw-r--r-- | devel/gitaly/files/patch-ruby_Gemfile | 9 | ||||
| -rw-r--r-- | www/gitlab-ce/Makefile | 2 | ||||
| -rw-r--r-- | www/gitlab-ce/files/patch-Gemfile | 11 |
4 files changed, 6 insertions, 20 deletions
diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index acde6b530def..12ab0cc9661a 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -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 \ diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile index 5cd62893b24e..2e700525ffc0 100644 --- a/devel/gitaly/files/patch-ruby_Gemfile +++ b/devel/gitaly/files/patch-ruby_Gemfile @@ -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 diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 85a4e9fcf9a1..c1fdf22a51bb 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -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 \ diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index bf2d26d8a95e..a00d2284d787 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -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 |