svn commit: r461631 - in head/www/gitlab: . files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Mon Feb 12 19:04:44 2018
New Revision: 461631
URL: https://svnweb.freebsd.org/changeset/ports/461631

Log:
  Fix Gemfile for rubygem-attr_encrypted 3.1.0 update
  
  - Bump PORTREVISION for package change

Modified:
  head/www/gitlab/Makefile
  head/www/gitlab/files/patch-Gemfile

Modified: head/www/gitlab/Makefile
==============================================================================
--- head/www/gitlab/Makefile	Mon Feb 12 19:04:38 2018	(r461630)
+++ head/www/gitlab/Makefile	Mon Feb 12 19:04:44 2018	(r461631)
@@ -4,7 +4,7 @@
 PORTNAME=	gitlab
 PORTVERSION=	10.1.6
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel
 
 MAINTAINER=	idefix at fechner.net

Modified: head/www/gitlab/files/patch-Gemfile
==============================================================================
--- head/www/gitlab/files/patch-Gemfile	Mon Feb 12 19:04:38 2018	(r461630)
+++ head/www/gitlab/files/patch-Gemfile	Mon Feb 12 19:04:44 2018	(r461631)
@@ -1,6 +1,6 @@
 --- Gemfile.orig	2018-01-11 16:23:59 UTC
 +++ Gemfile
-@@ -1,49 +1,49 @@
+@@ -1,55 +1,55 @@
  source 'https://rubygems.org'
  
 -gem 'rails', '4.2.8'
@@ -64,6 +64,13 @@
  gem 'akismet', '~> 2.0'
  
  # Two-factor authentication
+ gem 'devise-two-factor', '~> 3.0.0'
+ gem 'rqrcode-rails3', '~> 0.1.7'
+-gem 'attr_encrypted', '~> 3.0.0'
++gem 'attr_encrypted', '~> 3.0'
+ gem 'u2f', '~> 0.2.1'
+ 
+ # GitLab Pages
 @@ -73,11 +73,11 @@ gem 'gollum-lib', '~> 4.2', require: fal
  gem 'gollum-rugged_adapter', '~> 0.4.4', require: false