aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorsten Zuehlsdorff <tz@FreeBSD.org>2017-07-06 10:13:15 +0000
committerTorsten Zuehlsdorff <tz@FreeBSD.org>2017-07-06 10:13:15 +0000
commit01c38b86b66525fb143ab51e5aa8f8d4558c9d7b (patch)
tree418fa65166917d70b0694696cd66b212976cb04f
parent64f9316bd8c0d76d46cfd079bc79f839f33d8153 (diff)
downloadports-01c38b86b66525fb143ab51e5aa8f8d4558c9d7b.tar.gz
ports-01c38b86b66525fb143ab51e5aa8f8d4558c9d7b.zip
MFH: r445057
www/gitlab: Unbreak GitLab after Rails-Update GitLab currently does not start after an update of Rails to 4.2.9. Patch this, since its working fine with the new version. Submitted by: Matthias Fechner <idefix@fechner.net> Approved by: ports-secteam (junovitch)
Notes
Notes: svn path=/branches/2017Q3/; revision=445134
-rw-r--r--www/gitlab/Makefile2
-rw-r--r--www/gitlab/files/patch-Gemfile8
2 files changed, 8 insertions, 2 deletions
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index bdcd7cbee5d4..b69621ecde76 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gitlab
PORTVERSION= 9.0.10
DISTVERSIONPREFIX= v
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www devel
MAINTAINER= tz@FreeBSD.org
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index 6b0962d75ce0..9666ae27d17d 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,6 +1,12 @@
--- Gemfile.orig 2017-06-07 20:58:14 UTC
+++ Gemfile
-@@ -6,41 +6,36 @@ gem 'rails-deprecated_sanitizer', '~> 1.
+@@ -1,46 +1,41 @@
+ source 'https://rubygems.org'
+
+-gem 'rails', '4.2.8'
++gem 'rails', '>= 4.2.8'
+ gem 'rails-deprecated_sanitizer', '~> 1.0.3'
+
# Responders respond_to and respond_with
gem 'responders', '~> 2.0'