From owner-svn-ports-all@freebsd.org  Thu Jul  6 10:13:16 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 CE03FDA9AEC;
 Thu,  6 Jul 2017 10:13:16 +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 8D7076535A;
 Thu,  6 Jul 2017 10:13:16 +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 v66ADFYh033680;
 Thu, 6 Jul 2017 10:13:15 GMT (envelope-from tz@FreeBSD.org)
Received: (from tz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v66ADFC4033678;
 Thu, 6 Jul 2017 10:13:15 GMT (envelope-from tz@FreeBSD.org)
Message-Id: <201707061013.v66ADFC4033678@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, 6 Jul 2017 10:13:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r445134 - in branches/2017Q3/www/gitlab: . files
X-SVN-Group: ports-branches
X-SVN-Commit-Author: tz
X-SVN-Commit-Paths: in branches/2017Q3/www/gitlab: . files
X-SVN-Commit-Revision: 445134
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, 06 Jul 2017 10:13:16 -0000

Author: tz
Date: Thu Jul  6 10:13:15 2017
New Revision: 445134
URL: https://svnweb.freebsd.org/changeset/ports/445134

Log:
  MFH: r445057
  
  www/gitlab: Unbreak GitLab after Rails-Update
  
  GitLab currently does not start after an update of
  Rails to 4.2.9. Patch this, since its working
  fine with the new version.
  
  Submitted by: Matthias Fechner <idefix@fechner.net>
  
  Approved by: ports-secteam (junovitch)

Modified:
  branches/2017Q3/www/gitlab/Makefile
  branches/2017Q3/www/gitlab/files/patch-Gemfile
Directory Properties:
  branches/2017Q3/   (props changed)

Modified: branches/2017Q3/www/gitlab/Makefile
==============================================================================
--- branches/2017Q3/www/gitlab/Makefile	Thu Jul  6 10:10:08 2017	(r445133)
+++ branches/2017Q3/www/gitlab/Makefile	Thu Jul  6 10:13:15 2017	(r445134)
@@ -4,7 +4,7 @@
 PORTNAME=	gitlab
 PORTVERSION=	9.0.10
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel
 
 MAINTAINER=	tz@FreeBSD.org

Modified: branches/2017Q3/www/gitlab/files/patch-Gemfile
==============================================================================
--- branches/2017Q3/www/gitlab/files/patch-Gemfile	Thu Jul  6 10:10:08 2017	(r445133)
+++ branches/2017Q3/www/gitlab/files/patch-Gemfile	Thu Jul  6 10:13:15 2017	(r445134)
@@ -1,6 +1,12 @@
 --- Gemfile.orig	2017-06-07 20:58:14 UTC
 +++ Gemfile
-@@ -6,41 +6,36 @@ gem 'rails-deprecated_sanitizer', '~> 1.
+@@ -1,46 +1,41 @@
+ source 'https://rubygems.org'
+ 
+-gem 'rails', '4.2.8'
++gem 'rails', '>= 4.2.8'
+ gem 'rails-deprecated_sanitizer', '~> 1.0.3'
+ 
  # Responders respond_to and respond_with
  gem 'responders', '~> 2.0'