diff options
| author | tz <tz@FreeBSD.org> | 2016-12-23 18:49:08 +0800 |
|---|---|---|
| committer | tz <tz@FreeBSD.org> | 2016-12-23 18:49:08 +0800 |
| commit | 14c366df2dd46e7965d62066c56513bbffba75f9 (patch) | |
| tree | db75b6193516efcf214c054dd0fd1e0f70581630 | |
| parent | 2ba35fdc58813900572a679f8a792e848bfa5bee (diff) | |
| download | freebsd-ports-gnome-14c366df2dd46e7965d62066c56513bbffba75f9.tar.gz freebsd-ports-gnome-14c366df2dd46e7965d62066c56513bbffba75f9.tar.zst freebsd-ports-gnome-14c366df2dd46e7965d62066c56513bbffba75f9.zip | |
www/gitlab: Unbreak after update of www/rubygem-jquery-rails4
PR: 215505
Reported by: Martin Waschbüsch <martin@waschbuesch.de>
Approved by: mentors (implicit)
| -rw-r--r-- | www/gitlab/Makefile | 2 | ||||
| -rw-r--r-- | www/gitlab/files/patch-Gemfile | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index cf6c3a0d4f84..1909a0e1cf8a 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -4,7 +4,7 @@ PORTNAME= gitlab PORTVERSION= 8.11.11 DISTVERSIONPREFIX= v -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www devel MAINTAINER= tz@FreeBSD.org diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 8c8bf8c8971a..af61b620ed77 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -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' |