diff --git a/Gemfile b/Gemfile index c3cb1cd..0ac1cd9 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ gem 'activerecord' gem 'gibbon', '0.3.5' gem 'geocoder', '1.1.1' gem 'devise', '2.0.4' -gem 'omniauth', '1.0.3' +gem 'omniauth', '1.4.2' gem 'omniauth-twitter' gem 'omniauth-facebook' diff --git a/Gemfile.lock b/Gemfile.lock index de48685..39fa7c9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,11 +49,9 @@ GEM geocoder (1.1.1) gibbon (0.3.5) httparty (> 0.6.0) - httparty (> 0.6.0) - json (> 1.4.0) json (> 1.4.0) rdoc - hashie (1.2.0) + hashie (3.6.0) hike (1.2.1) httparty (0.8.1) multi_json @@ -80,9 +78,9 @@ GEM oauth2 (0.5.2) faraday (~> 0.7) multi_json (~> 1.0) - omniauth (1.0.3) - hashie (~> 1.2) - rack + omniauth (1.4.2) + hashie (>= 1.2, < 4) + rack (>= 1.0, < 3) omniauth-facebook (1.2.0) omniauth-oauth2 (~> 1.0.0) omniauth-github (1.0.1) @@ -100,7 +98,7 @@ GEM omniauth-oauth (~> 1.0) orm_adapter (0.0.6) polyglot (0.3.3) - rack (1.4.1) + rack (1.4.7) rack-cache (1.2) rack (>= 0.4) rack-ssl (1.3.2) @@ -152,7 +150,7 @@ DEPENDENCIES mongo (= 1.6.1) mongoid nifty-generators (= 0.4.6) - omniauth (= 1.0.3) + omniauth (= 1.4.2) omniauth-facebook omniauth-github omniauth-linkedin