summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-10-06 21:42:32 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-10-06 21:55:27 -0400
commit0dd49560b95439a74eb25282127a3d8066b68e2a (patch)
treedd725fb7793f55bcb3ecd7736189a50a97a7e6d4 /Gemfile.lock
parentad627e40dcb00b54761a60078448286667a179fd (diff)
downloadgitlab-ce-0dd49560b95439a74eb25282127a3d8066b68e2a.tar.gz
Update omniauth-twitter to ~> 1.2.0
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 1dd56cd9c8c..8a0474a062b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -456,9 +456,9 @@ GEM
ruby-saml (~> 1.0.0)
omniauth-shibboleth (1.1.2)
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)
@@ -874,7 +874,7 @@ DEPENDENCIES
omniauth-kerberos (~> 0.2.0)
omniauth-saml (~> 1.4.0)
omniauth-shibboleth (~> 1.1.1)
- omniauth-twitter (~> 1.0.1)
+ omniauth-twitter (~> 1.2.0)
omniauth_crowd
org-ruby (~> 0.9.12)
paranoia (~> 2.0)