svn commit: r429243 - in head/www/gitlab: . files
Torsten Zuehlsdorff
tz at FreeBSD.org
Fri Dec 23 10:49:09 UTC 2016
Author: tz
Date: Fri Dec 23 10:49:08 2016
New Revision: 429243
URL: https://svnweb.freebsd.org/changeset/ports/429243
Log:
www/gitlab: Unbreak after update of www/rubygem-jquery-rails4
PR: 215505
Reported by: Martin Waschbüsch <martin at waschbuesch.de>
Approved by: mentors (implicit)
Modified:
head/www/gitlab/Makefile
head/www/gitlab/files/patch-Gemfile
Modified: head/www/gitlab/Makefile
==============================================================================
--- head/www/gitlab/Makefile Fri Dec 23 10:15:39 2016 (r429242)
+++ head/www/gitlab/Makefile Fri Dec 23 10:49:08 2016 (r429243)
@@ -4,7 +4,7 @@
PORTNAME= gitlab
PORTVERSION= 8.11.11
DISTVERSIONPREFIX= v
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www devel
MAINTAINER= tz at FreeBSD.org
Modified: head/www/gitlab/files/patch-Gemfile
==============================================================================
--- head/www/gitlab/files/patch-Gemfile Fri Dec 23 10:15:39 2016 (r429242)
+++ head/www/gitlab/files/patch-Gemfile Fri Dec 23 10:49:08 2016 (r429243)
@@ -135,7 +135,7 @@
# Ace editor
gem 'ace-rails-ap', '~> 4.1.0'
-@@ -215,11 +213,11 @@ gem 'chronic_duration', '~> 0.10.6'
+@@ -215,22 +213,22 @@ gem 'chronic_duration', '~> 0.10.6'
gem 'sass-rails', '~> 5.0.0'
gem 'coffee-rails', '~> 4.1.0'
@@ -149,9 +149,10 @@
gem 'bootstrap-sass', '~> 3.3.0'
gem 'font-awesome-rails', '~> 4.6.1'
gem 'gemojione', '~> 3.0'
-@@ -227,10 +225,10 @@ gem 'gon', '~> 6.1.0'
+ gem 'gon', '~> 6.1.0'
gem 'jquery-atwho-rails', '~> 1.3.2'
- gem 'jquery-rails', '~> 4.1.0'
+-gem 'jquery-rails', '~> 4.1.0'
++gem 'jquery-rails', '>= 4.1.0'
gem 'jquery-ui-rails', '~> 5.0.0'
-gem 'request_store', '~> 1.3.0'
+gem 'request_store', '>= 1.3.0'
More information about the svn-ports-head
mailing list