svn commit: r486197 - in head/www/gitlab-ce: . files
Matthias Fechner
mfechner at FreeBSD.org
Thu Nov 29 16:55:36 UTC 2018
Author: mfechner
Date: Thu Nov 29 16:55:34 2018
New Revision: 486197
URL: https://svnweb.freebsd.org/changeset/ports/486197
Log:
Fixed problem that gitlab-ce does not work with rubygem-grape version 1.2.x.
The problem is also reported upstream:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23451
Approved by: mentors (implicit)
Modified:
head/www/gitlab-ce/Makefile
head/www/gitlab-ce/files/patch-Gemfile
Modified: head/www/gitlab-ce/Makefile
==============================================================================
--- head/www/gitlab-ce/Makefile Thu Nov 29 16:49:45 2018 (r486196)
+++ head/www/gitlab-ce/Makefile Thu Nov 29 16:55:34 2018 (r486197)
@@ -3,6 +3,7 @@
PORTNAME= gitlab-ce
PORTVERSION= 11.5.1
+PORTREVISION= 1
CATEGORIES= www devel
MAINTAINER= mfechner at FreeBSD.org
@@ -62,7 +63,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \
rubygem-gpgme>=2.0.13:security/rubygem-gpgme \
rubygem-gitlab_omniauth-ldap20>=2.0.4:net/rubygem-gitlab_omniauth-ldap20 \
rubygem-net-ldap>=0.16.0:net/rubygem-net-ldap \
- rubygem-grape>=1.1:devel/rubygem-grape \
+ rubygem-grape11>=1.1:devel/rubygem-grape11 \
rubygem-grape-entity>=0.7.1:devel/rubygem-grape-entity \
rubygem-rack-cors>=1.0.0:www/rubygem-rack-cors \
rubygem-graphql>=1.8.0:devel/rubygem-graphql \
Modified: head/www/gitlab-ce/files/patch-Gemfile
==============================================================================
--- head/www/gitlab-ce/files/patch-Gemfile Thu Nov 29 16:49:45 2018 (r486196)
+++ head/www/gitlab-ce/files/patch-Gemfile Thu Nov 29 16:55:34 2018 (r486197)
@@ -1,4 +1,4 @@
---- Gemfile.orig 2018-11-21 10:39:57 UTC
+--- Gemfile.orig 2018-11-26 22:36:34 UTC
+++ Gemfile
@@ -24,7 +24,7 @@ gem 'sprockets', '~> 3.7.0'
gem 'default_value_for', gem_versions['default_value_for']
@@ -9,6 +9,15 @@
gem 'pg', '~> 0.18.2', group: :postgres
gem 'rugged', '~> 0.27'
+@@ -80,7 +80,7 @@ gem 'gitlab_omniauth-ldap', '~> 2.0.4',
+ gem 'net-ldap'
+
+ # API
+-gem 'grape', '~> 1.1'
++gem 'grape', '~> 1.1.0'
+ gem 'grape-entity', '~> 0.7.1'
+ gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
+
@@ -173,7 +173,7 @@ gem 'redis-namespace', '~> 1.6.0'
gem 'rufus-scheduler', '~> 3.4'
More information about the svn-ports-all
mailing list