aboutsummaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authortz <tz@FreeBSD.org>2016-10-14 19:13:25 +0800
committertz <tz@FreeBSD.org>2016-10-14 19:13:25 +0800
commit95a7473cf799d004bf26019a74ed445913fd4be5 (patch)
tree3b92a902ba7e915ee3cff650d89422e18f53af2a /www
parentbb75683008ce19129b0b4461be67513c55c1efb5 (diff)
downloadfreebsd-ports-gnome-95a7473cf799d004bf26019a74ed445913fd4be5.tar.gz
freebsd-ports-gnome-95a7473cf799d004bf26019a74ed445913fd4be5.tar.zst
freebsd-ports-gnome-95a7473cf799d004bf26019a74ed445913fd4be5.zip
www/gitlab: Unbreak after update of databases/rubygem-pg
Approved by: junovitch (mentor, implicit)
Diffstat (limited to 'www')
-rw-r--r--www/gitlab/Makefile2
-rw-r--r--www/gitlab/files/patch-Gemfile6
2 files changed, 5 insertions, 3 deletions
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index eaab8e2be337..b8d3927a0ed6 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gitlab
PORTVERSION= 8.9.6
-PORTREVISION= 3
+PORTREVISION= 4
DISTVERSIONPREFIX= v
CATEGORIES= www devel
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index 6c7f018cfeeb..ab03c9755a58 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -8,7 +8,7 @@
gem 'rails-deprecated_sanitizer', '~> 1.0.3'
# Responders respond_to and respond_with
-@@ -8,13 +8,12 @@ gem 'responders', '~> 2.0'
+@@ -8,14 +8,13 @@ gem 'responders', '~> 2.0'
# Specify a sprockets version due to increased performance
# See https://gitlab.com/gitlab-org/gitlab-ce/issues/6069
@@ -21,9 +21,11 @@
# Supported DBs
-gem "mysql2", '~> 0.3.16', group: :mysql
- gem "pg", '~> 0.18.2', group: :postgres
+-gem "pg", '~> 0.18.2', group: :postgres
++gem "pg", '>= 0.18.2', group: :postgres
# Authentication libraries
+ gem 'devise', '~> 4.0'
@@ -28,13 +27,12 @@ gem 'omniauth-cas3', '~> 1.1.2'
gem 'omniauth-facebook', '~> 3.0.0'
gem 'omniauth-github', '~> 1.1.1'