summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorPatricio Cano <patricio@gitlab.com>2016-03-11 16:48:52 +0000
committerPatricio Cano <patricio@gitlab.com>2016-03-11 16:48:52 +0000
commit6bc7fad8ea2ace62157797e0c884ba36a5545152 (patch)
treee846edf9e3467fe441b616e895d87c3bc050fbe1 /Gemfile.lock
parent6968ea32e2beade8bc5aee9c30451b6ed48fcc5f (diff)
parent95e73f87a99a0869d503451ab93a36bdc2530445 (diff)
downloadgitlab-ce-6bc7fad8ea2ace62157797e0c884ba36a5545152.tar.gz
Merge branch 'omniauth-saml-upgrade' into 'master'
Upgrade `omniauth-saml` to 1.5.0 and document it's new capabilities. With this MR I'm upgrading `omniauth-saml` to 1.5.0 to include new and improved functionality. See https://github.com/omniauth/omniauth-saml/blob/master/CHANGELOG.md for more details. This MR includes new documentation, so @axil can you also take a look? /cc @DouweM See merge request !3170
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock8
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 3777528ea4b..d4e28db00d6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -532,8 +532,8 @@ GEM
omniauth-oauth2 (1.3.1)
oauth2 (~> 1.0)
omniauth (~> 1.2)
- omniauth-saml (1.4.2)
- omniauth (~> 1.1)
+ omniauth-saml (1.5.0)
+ omniauth (~> 1.3)
ruby-saml (~> 1.1, >= 1.1.1)
omniauth-shibboleth (1.2.1)
omniauth (>= 1.0.0)
@@ -692,7 +692,7 @@ GEM
ruby-fogbugz (0.2.1)
crack (~> 0.4)
ruby-progressbar (1.7.5)
- ruby-saml (1.1.1)
+ ruby-saml (1.1.2)
nokogiri (>= 1.5.10)
uuid (~> 2.3)
ruby2ruby (2.2.0)
@@ -975,7 +975,7 @@ DEPENDENCIES
omniauth-gitlab (~> 1.0.0)
omniauth-google-oauth2 (~> 0.2.0)
omniauth-kerberos (~> 0.3.0)
- omniauth-saml (~> 1.4.2)
+ omniauth-saml (~> 1.5.0)
omniauth-shibboleth (~> 1.2.0)
omniauth-twitter (~> 1.2.0)
omniauth_crowd (~> 2.2.0)