summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-21 17:38:37 +0100
committerDouwe Maan <douwe@gitlab.com>2015-12-21 17:38:37 +0100
commit9832e60ffb801427453301c6da4675f81518cdeb (patch)
treedc8e1b7692be8cde7e57b7059de23385e177beed /Gemfile.lock
parente209ba7002238459b56ced1f5b4a7ce8bd6e2b8b (diff)
parent7fc2422c8d660d310b819b2b6ffbca9a9e4d8cd6 (diff)
downloadgitlab-ce-9832e60ffb801427453301c6da4675f81518cdeb.tar.gz
Merge branch 'tduehr/gitlab-ce-cas-support'
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock5
1 files changed, 5 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 88c7a6e3424..35abd152449 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -439,6 +439,10 @@ GEM
multi_json (~> 1.7)
omniauth (~> 1.1)
omniauth-oauth (~> 1.0)
+ omniauth-cas3 (1.1.3)
+ addressable (~> 2.3)
+ nokogiri (~> 1.6.6)
+ omniauth (~> 1.2)
omniauth-facebook (3.0.0)
omniauth-oauth2 (~> 1.2)
omniauth-github (1.1.2)
@@ -893,6 +897,7 @@ DEPENDENCIES
octokit (~> 3.7.0)
omniauth (~> 1.2.2)
omniauth-bitbucket (~> 0.0.2)
+ omniauth-cas3 (~> 1.1.2)
omniauth-facebook (~> 3.0.0)
omniauth-github (~> 1.1.1)
omniauth-gitlab (~> 1.0.0)