diff options
author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2018-02-12 19:04:44 +0000 |
---|---|---|
committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2018-02-12 19:04:44 +0000 |
commit | a1dfd95dc09b84abb614365bd842e4d36a976bf8 (patch) | |
tree | cb5289040e27952753dbe7603d74df52418ba403 /www/gitlab | |
parent | 41ad5941535b0c03ae6b2192a9460c7913c21e07 (diff) |
Notes
Diffstat (limited to 'www/gitlab')
-rw-r--r-- | www/gitlab/Makefile | 2 | ||||
-rw-r--r-- | www/gitlab/files/patch-Gemfile | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index c78ca40aea0f..63b3dfb862f6 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -4,7 +4,7 @@ PORTNAME= gitlab PORTVERSION= 10.1.6 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www devel MAINTAINER= idefix@fechner.net diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 78bad0a8f320..70b5605ad036 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -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 |