diff options
| author | tz <tz@FreeBSD.org> | 2016-10-13 20:49:34 +0800 |
|---|---|---|
| committer | tz <tz@FreeBSD.org> | 2016-10-13 20:49:34 +0800 |
| commit | 4783110c6a82593c7719f8f5380e27251e0f390f (patch) | |
| tree | 165ca3c46957fe6e07f8aa00c513e0d522cfea75 /www | |
| parent | 5c1a442cd5dbb4a39031c21bb65c12f06fd21e64 (diff) | |
| download | freebsd-ports-gnome-4783110c6a82593c7719f8f5380e27251e0f390f.tar.gz freebsd-ports-gnome-4783110c6a82593c7719f8f5380e27251e0f390f.tar.zst freebsd-ports-gnome-4783110c6a82593c7719f8f5380e27251e0f390f.zip | |
www/gitlab: Use www/rubygem-turbolinks-classic instead of www/rubygem-turbolinks
This fixes various problems with the issue-pages of GitLab
PR: 213218
Approved by: junovitch (mentor, implicit)
Diffstat (limited to 'www')
| -rw-r--r-- | www/gitlab/Makefile | 4 | ||||
| -rw-r--r-- | www/gitlab/files/patch-Gemfile | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index db0239e43c14..eaab8e2be337 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -3,7 +3,7 @@ PORTNAME= gitlab PORTVERSION= 8.9.6 -PORTREVISION= 2 +PORTREVISION= 3 DISTVERSIONPREFIX= v CATEGORIES= www devel @@ -121,7 +121,7 @@ RUN_DEPENDS= git>=2.7.4:devel/git \ rubygem-sass-rails5>=5.0.0:textproc/rubygem-sass-rails5 \ rubygem-coffee-rails4>=4.1.0:devel/rubygem-coffee-rails4 \ rubygem-uglifier>=2.7.2:www/rubygem-uglifier \ - rubygem-turbolinks>=2.5.0:www/rubygem-turbolinks \ + rubygem-turbolinks-classic>=2.5.0:www/rubygem-turbolinks-classic \ rubygem-jquery-turbolinks>=2.1.0:www/rubygem-jquery-turbolinks \ rubygem-addressable>=2.3.8:www/rubygem-addressable \ rubygem-bootstrap-sass>=3.3.0:www/rubygem-bootstrap-sass \ diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 8ed1724e8153..6c7f018cfeeb 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -141,9 +141,8 @@ gem "sass-rails", '~> 5.0.0' gem "coffee-rails", '~> 4.1.0' -gem "uglifier", '~> 2.7.2' --gem 'turbolinks', '~> 2.5.0' +gem "uglifier", '>= 2.7.2' -+gem 'turbolinks', '>= 2.5.0' + gem 'turbolinks', '~> 2.5.0' gem 'jquery-turbolinks', '~> 2.1.0' -gem 'addressable', '~> 2.3.8' |