Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Dec 2018 22:04:31 +0000 (UTC)
From:      Matthias Fechner <mfechner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r486558 - in head/www/gitlab-ce: . files
Message-ID:  <201812032204.wB3M4Vx2047605@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mfechner
Date: Mon Dec  3 22:04:30 2018
New Revision: 486558
URL: https://svnweb.freebsd.org/changeset/ports/486558

Log:
  Updated the Gemfile to work with the upgraded rails 4.2.11 which includes security fixes.
  
  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	Mon Dec  3 21:38:04 2018	(r486557)
+++ head/www/gitlab-ce/Makefile	Mon Dec  3 22:04:30 2018	(r486558)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gitlab-ce
 PORTVERSION=	11.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel
 
 MAINTAINER=	mfechner@FreeBSD.org

Modified: head/www/gitlab-ce/files/patch-Gemfile
==============================================================================
--- head/www/gitlab-ce/files/patch-Gemfile	Mon Dec  3 21:38:04 2018	(r486557)
+++ head/www/gitlab-ce/files/patch-Gemfile	Mon Dec  3 22:04:30 2018	(r486558)
@@ -1,5 +1,14 @@
 --- Gemfile.orig	2018-11-26 22:36:34 UTC
 +++ Gemfile
+@@ -6,7 +6,7 @@ end
+ gem_versions = {}
+ gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0'      : '0.2'
+ gem_versions['default_value_for']               = rails5? ? '~> 3.0.5' : '~> 3.0.0'
+-gem_versions['rails']                           = rails5? ? '5.0.7'    : '4.2.10'
++gem_versions['rails']                           = rails5? ? '5.0.7'    : '4.2.11'
+ gem_versions['rails-i18n']                      = rails5? ? '~> 5.1'   : '~> 4.0.9'
+ # --- The end of special code for migrating to Rails 5.0 ---
+ 
 @@ -24,7 +24,7 @@ gem 'sprockets', '~> 3.7.0'
  gem 'default_value_for', gem_versions['default_value_for']
  



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