summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-07 17:09:43 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-07 17:09:43 +0000
commit81fb0a9c18ce80c9a3b8f024abc8a905fc1b5a52 (patch)
tree37e7792443da60d42d6517387621d34ae16a7993 /Gemfile.lock
parent030b5038b1ba84fb5570f064d53ee9b1328e43ea (diff)
parent33222b575603e6e24446ded8fa33ff36cfa25c0e (diff)
downloadgitlab-ce-81fb0a9c18ce80c9a3b8f024abc8a905fc1b5a52.tar.gz
Merge branch 'rs-update-omniauth-gems' into 'master'
Update omniauth-* gem dependencies - twitter to `~> 1.2.0` - closes #2763 - kerberos to `~> 0.3.0` - closes #2792 - google-oauth2 to `~> 0.2.0` - shibboleth to `~> 1.2.0` - closes #2791 See merge request !1526
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock18
1 files changed, 9 insertions, 9 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 5eaf3808425..fc9244304a3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -440,7 +440,7 @@ GEM
omniauth-google-oauth2 (0.2.6)
omniauth (> 1.0)
omniauth-oauth2 (~> 1.1)
- omniauth-kerberos (0.2.0)
+ omniauth-kerberos (0.3.0)
omniauth-multipassword
timfel-krb5-auth (~> 0.8)
omniauth-multipassword (0.4.2)
@@ -454,11 +454,11 @@ GEM
omniauth-saml (1.4.1)
omniauth (~> 1.1)
ruby-saml (~> 1.0.0)
- omniauth-shibboleth (1.1.2)
+ omniauth-shibboleth (1.2.1)
omniauth (>= 1.0.0)
- omniauth-twitter (1.0.1)
- multi_json (~> 1.3)
- omniauth-oauth (~> 1.0)
+ omniauth-twitter (1.2.1)
+ json (~> 1.3)
+ omniauth-oauth (~> 1.1)
omniauth_crowd (2.2.3)
activesupport
nokogiri (>= 1.4.4)
@@ -870,11 +870,11 @@ DEPENDENCIES
omniauth-bitbucket (~> 0.0.2)
omniauth-github (~> 1.1.1)
omniauth-gitlab (~> 1.0.0)
- omniauth-google-oauth2 (~> 0.2.5)
- omniauth-kerberos (~> 0.2.0)
+ omniauth-google-oauth2 (~> 0.2.0)
+ omniauth-kerberos (~> 0.3.0)
omniauth-saml (~> 1.4.0)
- omniauth-shibboleth (~> 1.1.1)
- omniauth-twitter (~> 1.0.1)
+ omniauth-shibboleth (~> 1.2.0)
+ omniauth-twitter (~> 1.2.0)
omniauth_crowd
org-ruby (~> 0.9.12)
paranoia (~> 2.0)