diff --git a/Gemfile b/Gemfile index c856352d3..5bd6a3a90 100644 --- a/Gemfile +++ b/Gemfile @@ -34,7 +34,7 @@ gem "kaminari", "~> 1.2.1" gem "newrelic_rpm", "~> 4.1.0.333" gem "omniauth", "~> 1.9.1" gem "omniauth-facebook", "~> 4.0.0" -gem "omniauth-google-oauth2", "~> 0.4.0" +gem "omniauth-google-oauth2", "~> 0.8.0" gem "omniauth-rails_csrf_protection", "~> 0.1.2" gem "omniauth-twitter", "~> 1.4.0" gem "paperclip", "~> 6.1.0" diff --git a/Gemfile.lock b/Gemfile.lock index b918cdb4f..3119a74bc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -217,7 +217,7 @@ GEM railties (>= 3.0.0) faker (1.8.7) i18n (>= 0.7) - faraday (0.12.2) + faraday (0.17.3) multipart-post (>= 1.2, < 3) faraday-http-cache (2.0.0) faraday (~> 0.8) @@ -296,7 +296,7 @@ GEM jquery-ui-rails (6.0.1) railties (>= 3.2.16) json (2.3.0) - jwt (1.5.6) + jwt (2.2.2) kaminari (1.2.1) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.1) @@ -347,9 +347,9 @@ GEM tomlrb mixlib-shellout (3.1.4) chef-utils - multi_json (1.13.1) + multi_json (1.15.0) multi_xml (0.6.0) - multipart-post (2.0.0) + multipart-post (2.1.1) net-scp (3.0.0) net-ssh (>= 2.6.5, < 7.0.0) net-ssh (6.1.0) @@ -359,9 +359,9 @@ GEM mini_portile2 (~> 2.4.0) nori (2.6.0) oauth (0.5.4) - oauth2 (1.4.0) - faraday (>= 0.8, < 0.13) - jwt (~> 1.0) + oauth2 (1.4.4) + faraday (>= 0.8, < 2.0) + jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) @@ -372,17 +372,16 @@ GEM rack (>= 1.6.2, < 3) omniauth-facebook (4.0.0) omniauth-oauth2 (~> 1.2) - omniauth-google-oauth2 (0.4.1) - jwt (~> 1.5.2) - multi_json (~> 1.3) + omniauth-google-oauth2 (0.8.0) + jwt (>= 2.0) omniauth (>= 1.1.1) - omniauth-oauth2 (>= 1.3.1) + omniauth-oauth2 (>= 1.6) omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.5.0) - oauth2 (~> 1.1) - omniauth (~> 1.2) + omniauth-oauth2 (1.7.0) + oauth2 (~> 1.4) + omniauth (~> 1.9) omniauth-rails_csrf_protection (0.1.2) actionpack (>= 4.2) omniauth (>= 1.3.1) @@ -673,7 +672,7 @@ DEPENDENCIES newrelic_rpm (~> 4.1.0.333) omniauth (~> 1.9.1) omniauth-facebook (~> 4.0.0) - omniauth-google-oauth2 (~> 0.4.0) + omniauth-google-oauth2 (~> 0.8.0) omniauth-rails_csrf_protection (~> 0.1.2) omniauth-twitter (~> 1.4.0) paperclip (~> 6.1.0)