Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 29 Jun 2017 08:56:46 +0000 (UTC)
From:      Torsten Zuehlsdorff <tz@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r444631 - in head/www/gitlab: . files
Message-ID:  <201706290856.v5T8ukhw003613@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tz
Date: Thu Jun 29 08:56:46 2017
New Revision: 444631
URL: https://svnweb.freebsd.org/changeset/ports/444631

Log:
  www/gitlab: Fix broken patch
  
  A duplication slipped into a patch which breaks the build. Fix it.
  
  Submitted by: Matthias Fechner <idefix@fechner.net>
  Reported by:  Remko Lodder <remko@FreeBSD.org>

Modified:
  head/www/gitlab/Makefile
  head/www/gitlab/files/patch-config_initializers_8__gitaly.rb

Modified: head/www/gitlab/Makefile
==============================================================================
--- head/www/gitlab/Makefile	Thu Jun 29 08:53:07 2017	(r444630)
+++ head/www/gitlab/Makefile	Thu Jun 29 08:56:46 2017	(r444631)
@@ -4,6 +4,7 @@
 PORTNAME=	gitlab
 PORTVERSION=	9.0.10
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	www devel
 
 MAINTAINER=	tz@FreeBSD.org

Modified: head/www/gitlab/files/patch-config_initializers_8__gitaly.rb
==============================================================================
--- head/www/gitlab/files/patch-config_initializers_8__gitaly.rb	Thu Jun 29 08:53:07 2017	(r444630)
+++ head/www/gitlab/files/patch-config_initializers_8__gitaly.rb	Thu Jun 29 08:56:46 2017	(r444631)
@@ -3,8 +3,3 @@
 @@ -1,2 +1 @@
  # Make sure we initialize a Gitaly channel before Sidekiq starts multi-threaded execution.
 -Gitlab::GitalyClient.channel unless Rails.env.test?
---- config/initializers/8_gitaly.rb.orig	2017-06-07 20:58:14 UTC
-+++ config/initializers/8_gitaly.rb
-@@ -1,2 +1 @@
- # Make sure we initialize a Gitaly channel before Sidekiq starts multi-threaded execution.
--Gitlab::GitalyClient.channel unless Rails.env.test?



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706290856.v5T8ukhw003613>