summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorMatus Banas <matus.banas@heanet.ie>2014-08-28 09:57:30 +0100
committerMatus Banas <matus.banas@heanet.ie>2014-09-09 22:16:05 +0100
commitf8ec9dd397a1088271766da22ee372a24b64b291 (patch)
tree1fdac77c04b84f527c386cc2d6bc9a555eb9af65 /Gemfile.lock
parent6b7e80cb198926a07e3fc94ca850edd4ed4169b8 (diff)
downloadgitlab-ce-f8ec9dd397a1088271766da22ee372a24b64b291.tar.gz
added omniauth-shibboleth gem for shibboleth support
added documentation for shibboleth omniauth provider updated changelog
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock3
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index b20f4169174..dc0037d1592 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -321,6 +321,8 @@ GEM
omniauth-oauth2 (1.1.1)
oauth2 (~> 0.8.0)
omniauth (~> 1.0)
+ omniauth-shibboleth (1.1.1)
+ omniauth (>= 1.0.0)
omniauth-twitter (1.0.1)
multi_json (~> 1.3)
omniauth-oauth (~> 1.0)
@@ -644,6 +646,7 @@ DEPENDENCIES
omniauth-github
omniauth-google-oauth2
omniauth-twitter
+ omniauth-shibboleth
org-ruby
pg
poltergeist (~> 1.5.1)