From owner-svn-ports-all@freebsd.org Thu Nov 29 16:55:36 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DA0631144642; Thu, 29 Nov 2018 16:55:35 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7C8D675E28; Thu, 29 Nov 2018 16:55:35 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5EE2A1C4CF; Thu, 29 Nov 2018 16:55:35 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wATGtZjO042867; Thu, 29 Nov 2018 16:55:35 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wATGtYcE042865; Thu, 29 Nov 2018 16:55:34 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201811291655.wATGtYcE042865@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Thu, 29 Nov 2018 16:55:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r486197 - in head/www/gitlab-ce: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: in head/www/gitlab-ce: . files X-SVN-Commit-Revision: 486197 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7C8D675E28 X-Spamd-Result: default: False [0.23 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.33)[-0.327,0]; NEURAL_SPAM_LONG(0.31)[0.307,0]; NEURAL_SPAM_MEDIUM(0.25)[0.247,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Nov 2018 16:55:36 -0000 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@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'