summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2014-12-16 13:57:40 +0200
committerValery Sizov <vsv2711@gmail.com>2014-12-16 13:57:40 +0200
commit15303bbfd76ae91fcba6202c5449425cb3c99829 (patch)
treebf20fca7a23481d497bcdbd3f4330256a702a86f
parent8d71e4e0d0868de0659047f18cad08924a3ba49e (diff)
downloadgitlab-ce-15303bbfd76ae91fcba6202c5449425cb3c99829.tar.gz
add kerberos to Gemfile
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock7
2 files changed, 8 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index b4ca5969277..ce9b83308f3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,6 +28,7 @@ gem 'omniauth-google-oauth2'
gem 'omniauth-twitter'
gem 'omniauth-github'
gem 'omniauth-shibboleth'
+gem 'omniauth-kerberos'
# Extracting information from a git repository
# Provide access to Gitlab::Git library
diff --git a/Gemfile.lock b/Gemfile.lock
index 4bcb1eb0de5..a93935ff5cb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -322,6 +322,11 @@ GEM
omniauth-google-oauth2 (0.2.5)
omniauth (> 1.0)
omniauth-oauth2 (~> 1.1)
+ omniauth-kerberos (0.2.0)
+ omniauth-multipassword
+ timfel-krb5-auth (~> 0.8)
+ omniauth-multipassword (0.4.1)
+ omniauth (~> 1.0)
omniauth-oauth (1.0.1)
oauth
omniauth (~> 1.0)
@@ -531,6 +536,7 @@ GEM
thread_safe (0.3.4)
tilt (1.4.1)
timers (1.1.0)
+ timfel-krb5-auth (0.8)
tinder (1.9.3)
eventmachine (~> 1.0)
faraday (~> 0.8)
@@ -655,6 +661,7 @@ DEPENDENCIES
omniauth (~> 1.1.3)
omniauth-github
omniauth-google-oauth2
+ omniauth-kerberos
omniauth-shibboleth
omniauth-twitter
org-ruby (= 0.9.9)