From owner-svn-ports-all@freebsd.org  Thu Oct 26 07:28:08 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
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 C0FF6E405E6;
 Thu, 26 Oct 2017 07:28:08 +0000 (UTC) (envelope-from tz@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 8E3F16F78A;
 Thu, 26 Oct 2017 07:28:08 +0000 (UTC) (envelope-from tz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9Q7S7cU019024;
 Thu, 26 Oct 2017 07:28:07 GMT (envelope-from tz@FreeBSD.org)
Received: (from tz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9Q7S7fJ019023;
 Thu, 26 Oct 2017 07:28:07 GMT (envelope-from tz@FreeBSD.org)
Message-Id: <201710260728.v9Q7S7fJ019023@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org
 using -f
From: Torsten Zuehlsdorff <tz@FreeBSD.org>
Date: Thu, 26 Oct 2017 07:28:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r452906 - branches/2017Q4/www/gitlab/files
X-SVN-Group: ports-branches
X-SVN-Commit-Author: tz
X-SVN-Commit-Paths: branches/2017Q4/www/gitlab/files
X-SVN-Commit-Revision: 452906
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Oct 2017 07:28:08 -0000

Author: tz
Date: Thu Oct 26 07:28:07 2017
New Revision: 452906
URL: https://svnweb.freebsd.org/changeset/ports/452906

Log:
  www/gitlab: fix broken Gemfile patch
  
  I did not resolve the merge conflict correctly which results
  in pkg fallout. Now fix it by using the original patch file from
  www/gitlab r452776.
  
  Approved by: ports-secteam (swills)

Modified:
  branches/2017Q4/www/gitlab/files/patch-Gemfile

Modified: branches/2017Q4/www/gitlab/files/patch-Gemfile
==============================================================================
--- branches/2017Q4/www/gitlab/files/patch-Gemfile	Thu Oct 26 06:20:53 2017	(r452905)
+++ branches/2017Q4/www/gitlab/files/patch-Gemfile	Thu Oct 26 07:28:07 2017	(r452906)
@@ -41,7 +41,7 @@
 +gem 'omniauth-google-oauth2', '>= 0.4.1'
  gem 'omniauth-oauth2-generic', '~> 0.2.2'
  gem 'omniauth-saml', '~> 1.7.0'
- gem 'omniauth-shibboleth', '~> 1.2.0'
+-gem 'omniauth-shibboleth', '~> 1.2.0'
 -gem 'omniauth-twitter', '~> 1.2.0'
 +gem 'omniauth-shibboleth', '>= 1.2.0'
 +gem 'omniauth-twitter', '>= 1.2.0'