diff --git a/Gemfile b/Gemfile index 5efa7d67b..675e738b1 100644 --- a/Gemfile +++ b/Gemfile @@ -25,7 +25,7 @@ gem 'devise', '~> 3.5.6' gem 'omniauth' gem 'omniauth-twitter' gem 'omniauth-facebook', '~> 3.0.0' -gem 'omniauth-google-oauth2', '~> 0.3.0' +gem 'omniauth-google-oauth2', '~> 0.4.0' gem 'kaminari' gem 'ancestry' diff --git a/Gemfile.lock b/Gemfile.lock index ccc231b18..18fa95bd9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -208,7 +208,7 @@ GEM jquery-ui-rails (5.0.5) railties (>= 3.2.16) json (1.8.3) - jwt (1.5.1) + jwt (1.5.3) kaminari (0.16.3) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -239,19 +239,19 @@ GEM mini_portile2 (~> 2.0.0.rc2) nori (2.6.0) oauth (0.5.0) - oauth2 (1.1.0) + oauth2 (1.0.0) faraday (>= 0.8, < 0.10) - jwt (~> 1.0, < 1.5.2) + jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) - rack (>= 1.2, < 3) + rack (~> 1.2) omniauth (1.3.1) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) omniauth-facebook (3.0.0) omniauth-oauth2 (~> 1.2) - omniauth-google-oauth2 (0.3.1) - jwt (~> 1.0) + omniauth-google-oauth2 (0.4.1) + jwt (~> 1.5.2) multi_json (~> 1.3) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.3.1) @@ -471,7 +471,7 @@ DEPENDENCIES newrelic_rpm (~> 3.14) omniauth omniauth-facebook (~> 3.0.0) - omniauth-google-oauth2 (~> 0.3.0) + omniauth-google-oauth2 (~> 0.4.0) omniauth-twitter paranoia pg