From owner-svn-ports-all@freebsd.org Tue Jan 2 15:22:50 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BCE35EAA998; Tue, 2 Jan 2018 15:22:50 +0000 (UTC) (envelope-from swills@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 mx1.freebsd.org (Postfix) with ESMTPS id 7C0583C0F; Tue, 2 Jan 2018 15:22:50 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w02FMnUg012035; Tue, 2 Jan 2018 15:22:49 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w02FMnl2012033; Tue, 2 Jan 2018 15:22:49 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201801021522.w02FMnl2012033@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Tue, 2 Jan 2018 15:22:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r457866 - in head/www/gitlab: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/www/gitlab: . files X-SVN-Commit-Revision: 457866 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 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: Tue, 02 Jan 2018 15:22:50 -0000 Author: swills Date: Tue Jan 2 15:22:49 2018 New Revision: 457866 URL: https://svnweb.freebsd.org/changeset/ports/457866 Log: www/gitlab: fix Gemfile for updated dependencies PR: 224836 Submitted by: Matthias Fechner (maintainer) Modified: head/www/gitlab/Makefile (contents, props changed) head/www/gitlab/files/patch-Gemfile (contents, props changed) Modified: head/www/gitlab/Makefile ============================================================================== --- head/www/gitlab/Makefile Tue Jan 2 15:02:09 2018 (r457865) +++ head/www/gitlab/Makefile Tue Jan 2 15:22:49 2018 (r457866) @@ -4,7 +4,7 @@ PORTNAME= gitlab PORTVERSION= 10.1.5 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www devel MAINTAINER= idefix@fechner.net @@ -253,3 +253,4 @@ do-install: (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/${PORTNAME}) .include + Modified: head/www/gitlab/files/patch-Gemfile ============================================================================== --- head/www/gitlab/files/patch-Gemfile Tue Jan 2 15:02:09 2018 (r457865) +++ head/www/gitlab/files/patch-Gemfile Tue Jan 2 15:22:49 2018 (r457866) @@ -1,4 +1,4 @@ ---- Gemfile.orig 2017-11-14 20:51:25 UTC +--- Gemfile.orig 2017-12-07 12:02:52 UTC +++ Gemfile @@ -1,49 +1,49 @@ source 'https://rubygems.org' @@ -33,8 +33,9 @@ gem 'doorkeeper', '~> 4.2.0' gem 'doorkeeper-openid_connect', '~> 1.2.0' -gem 'omniauth', '~> 1.4.2' +-gem 'omniauth-auth0', '~> 1.4.1' +gem 'omniauth', '>= 1.4.2' - gem 'omniauth-auth0', '~> 1.4.1' ++gem 'omniauth-auth0', '>= 1.4.1' gem 'omniauth-azure-oauth2', '~> 0.0.9' gem 'omniauth-cas3', '~> 1.1.4' gem 'omniauth-facebook', '~> 4.0.0' @@ -44,9 +45,10 @@ +gem 'omniauth-google-oauth2', '>= 0.5.2' gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos gem 'omniauth-oauth2-generic', '~> 0.2.2' - gem 'omniauth-saml', '~> 1.7.0' +-gem 'omniauth-saml', '~> 1.7.0' -gem 'omniauth-shibboleth', '~> 1.2.0' -gem 'omniauth-twitter', '~> 1.2.0' ++gem 'omniauth-saml', '>= 1.7.0' +gem 'omniauth-shibboleth', '>= 1.2.0' +gem 'omniauth-twitter', '>= 1.2.0' gem 'omniauth_crowd', '~> 2.2.0' @@ -183,7 +185,7 @@ # Flowdock integration gem 'gitlab-flowdock-git-hook', '~> 1.0.1' -@@ -199,13 +199,13 @@ gem 'asana', '~> 0.6.0' +@@ -199,23 +199,23 @@ gem 'asana', '~> 0.6.0' gem 'ruby-fogbugz', '~> 0.2.1' # Kubernetes integration @@ -199,8 +201,12 @@ gem 'babosa', '~> 1.0.2' # Sanitizes SVG input -@@ -215,7 +215,7 @@ gem 'loofah', '~> 2.0.3' - gem 'licensee', '~> 8.7.0' +-gem 'loofah', '~> 2.0.3' ++gem 'loofah', '>= 2.0.3' + + # Working with license +-gem 'licensee', '~> 8.7.0' ++gem 'licensee', '>= 8.7.0' # Protect against bruteforcing -gem 'rack-attack', '~> 4.4.1'