diff --git a/Gemfile.lock b/Gemfile.lock index e86e906cc..ced74eda7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -215,7 +215,6 @@ GEM hashie (2.1.2) hike (1.2.3) http_accept_language (1.0.2) - httpauth (0.2.0) i18n (0.6.11) i18n-inflector (2.6.7) i18n (>= 0.4.1) @@ -238,8 +237,7 @@ GEM jquery-ui-rails (4.2.1) railties (>= 3.2.16) json (1.8.1) - jwt (0.1.10) - multi_json (>= 1.5) + jwt (1.0.0) kaminari (0.16.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -268,6 +266,7 @@ GEM rails multi_json (1.10.1) multi_test (0.1.1) + multi_xml (0.5.5) multipart-post (1.2.0) mysql2 (0.3.16) nested_form (0.3.2) @@ -277,11 +276,11 @@ GEM nokogiri (1.6.1) mini_portile (~> 0.5.0) oauth (0.4.7) - oauth2 (0.8.1) - faraday (~> 0.8) - httpauth (~> 0.1) - jwt (~> 0.1.4) - multi_json (~> 1.0) + oauth2 (0.9.4) + faraday (>= 0.8, < 0.10) + jwt (~> 1.0) + multi_json (~> 1.3) + multi_xml (~> 0.5) rack (~> 1.2) omniauth (1.2.1) hashie (>= 1.2, < 3) @@ -291,9 +290,11 @@ GEM omniauth-oauth (1.0.1) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.1.1) - oauth2 (~> 0.8.0) - omniauth (~> 1.0) + omniauth-oauth2 (1.1.2) + faraday (>= 0.8, < 0.10) + multi_json (~> 1.3) + oauth2 (~> 0.9.3) + omniauth (~> 1.2) omniauth-tumblr (1.1) omniauth-oauth (~> 1.0) omniauth-twitter (1.0.1)