aboutsummaryrefslogtreecommitdiff
path: root/www/gitlab
diff options
context:
space:
mode:
authorSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2017-06-08 13:32:27 +0000
committerSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2017-06-08 13:32:27 +0000
commit91ac07ab57270865b20bcbadcbe8029fba3e2bb5 (patch)
treef78039931e983deecddf4795fa8ae8a2021e40c5 /www/gitlab
parent5e841334d0e0f8cfda8e4856cb7cca46b16553c5 (diff)
Notes
Diffstat (limited to 'www/gitlab')
-rw-r--r--www/gitlab/files/patch-Gemfile7
1 files changed, 4 insertions, 3 deletions
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index fb0f544ac866..2cf66986e34e 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,6 +1,6 @@
--- Gemfile.orig 2017-05-05 12:53:55 UTC
+++ Gemfile
-@@ -1,26 +1,22 @@
+@@ -1,44 +1,39 @@
source 'https://rubygems.org'
-gem 'rails', '4.2.7.1'
@@ -32,11 +32,12 @@
gem 'omniauth-auth0', '~> 1.4.1'
gem 'omniauth-azure-oauth2', '~> 0.0.6'
gem 'omniauth-cas3', '~> 1.1.2'
-@@ -28,17 +24,16 @@ gem 'omniauth-facebook', '~> 4.0.0'
+ gem 'omniauth-facebook', '~> 4.0.0'
gem 'omniauth-github', '~> 1.1.1'
gem 'omniauth-gitlab', '~> 1.0.2'
- gem 'omniauth-google-oauth2', '~> 0.4.1'
+-gem 'omniauth-google-oauth2', '~> 0.4.1'
-gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
++gem 'omniauth-google-oauth2', '>= 0.4.1'
gem 'omniauth-saml', '~> 1.7.0'
gem 'omniauth-shibboleth', '~> 1.2.0'
-gem 'omniauth-twitter', '~> 1.2.0'