diff --git a/Gemfile.lock b/Gemfile.lock index f9dadb6..13d979a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -89,8 +89,8 @@ GEM multi_json (~> 1.0) factory_girl (4.0.0) activesupport (>= 3.0.0) - faraday (0.8.4) - multipart-post (~> 1.1) + faraday (0.17.0) + multipart-post (>= 1.2, < 3) ffi (1.4.0) gherkin (2.11.2) json (>= 1.4.6) @@ -110,19 +110,17 @@ GEM guard (>= 1.1) guard-shell (0.5.1) guard (>= 1.1.0) - hashie (1.2.0) + hashie (3.6.0) headless (0.3.1) highline (1.6.15) hike (1.2.1) - httpauth (0.1) i18n (0.6.1) journey (1.0.4) jquery-rails (2.1.1) railties (>= 3.1.0, < 5.0) thor (~> 0.14) json (1.7.7) - jwt (0.1.5) - multi_json (>= 1.0) + jwt (2.2.1) kaminari (0.13.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -140,8 +138,9 @@ GEM treetop (~> 1.4.8) mime (0.1) mime-types (1.21) - multi_json (1.6.1) - multipart-post (1.1.5) + multi_json (1.14.0) + multi_xml (0.6.0) + multipart-post (2.1.1) net-scp (1.1.0) net-ssh (>= 2.6.5) net-sftp (2.1.1) @@ -151,24 +150,24 @@ GEM net-ssh (>= 2.6.5) nokogiri (1.5.5) oauth (0.4.6) - oauth2 (0.8.0) - faraday (~> 0.8) - httpauth (~> 0.1) - jwt (~> 0.1.4) - multi_json (~> 1.0) - rack (~> 1.2) - omniauth (1.1.0) - hashie (~> 1.2) - rack + oauth2 (1.4.2) + faraday (>= 0.8, < 2.0) + jwt (>= 1.0, < 3.0) + multi_json (~> 1.3) + multi_xml (~> 0.5) + rack (>= 1.2, < 3) + omniauth (1.4.2) + hashie (>= 1.2, < 4) + rack (>= 1.0, < 3) omniauth-github (1.0.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.1) omniauth-oauth (1.0.1) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.1.0) - oauth2 (~> 0.8.0) - omniauth (~> 1.0) + omniauth-oauth2 (1.5.0) + oauth2 (~> 1.1) + omniauth (~> 1.2) omniauth-twitter (0.0.12) multi_json (~> 1.3) omniauth-oauth (~> 1.0) @@ -183,7 +182,7 @@ GEM polyglot (0.3.3) prusswan-forem (0.0.2) rails (~> 3.2.7) - rack (1.4.5) + rack (1.4.7) rack-cache (1.2) rack (>= 0.4) rack-protection (1.2.0)