From 32f182bbc1e4036d4d0b40239c9d524946f6c5cd Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 6 Oct 2015 21:42:32 -0400
Subject: Update omniauth-twitter to ~> 1.2.0

---
 Gemfile      | 24 ++++++++++++------------
 Gemfile.lock |  8 ++++----
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Gemfile b/Gemfile
index 41ebf105f0a..4d797e14426 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,20 +22,20 @@ gem "mysql2", '~> 0.3.16', group: :mysql
 gem "pg", '~> 0.18.2', group: :postgres
 
 # Authentication libraries
-gem "devise", '~> 3.5.2'
-gem "devise-async", '~> 0.9.0'
-gem 'omniauth', "~> 1.2.2"
+gem 'devise',                 '~> 3.5.2'
+gem 'devise-async',           '~> 0.9.0'
+gem 'omniauth',               '~> 1.2.2'
+gem 'omniauth-bitbucket',     '~> 0.0.2'
+gem 'omniauth-github',        '~> 1.1.1'
+gem 'omniauth-gitlab',        '~> 1.0.0'
 gem 'omniauth-google-oauth2', '~> 0.2.5'
-gem 'omniauth-twitter', '~> 1.0.1'
-gem 'omniauth-github', '~> 1.1.1'
-gem 'omniauth-shibboleth', '~> 1.1.1'
-gem 'omniauth-kerberos', '~> 0.2.0', group: :kerberos
-gem 'omniauth-gitlab', '~> 1.0.0'
-gem 'omniauth-bitbucket', '~> 0.0.2'
-gem 'omniauth-saml', '~> 1.4.0'
-gem 'doorkeeper', '~> 2.1.3'
+gem 'omniauth-kerberos',      '~> 0.2.0', group: :kerberos
+gem 'omniauth-saml',          '~> 1.4.0'
+gem 'omniauth-shibboleth',    '~> 1.1.1'
+gem 'omniauth-twitter',       '~> 1.2.0'
 gem 'omniauth_crowd'
-gem "rack-oauth2", "~> 1.0.5"
+gem 'doorkeeper',             '~> 2.1.3'
+gem 'rack-oauth2',            '~> 1.0.5'
 
 # Two-factor authentication
 gem 'devise-two-factor', '~> 2.0.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9f3f2ca6ee0..e69fb04aca6 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)
-- 
cgit v1.2.1