diff --git a/Gemfile b/Gemfile index e6e02572d..dfa91bce1 100644 --- a/Gemfile +++ b/Gemfile @@ -34,10 +34,10 @@ gem "jquery-rails", "~> 4.4.0" gem "jquery-ui-rails", "~> 6.0.1" gem "kaminari", "~> 1.2.1" gem "newrelic_rpm", "~> 4.1.0.333" -gem "omniauth", "~> 1.9.1" +gem "omniauth", "~> 2.0.4" gem "omniauth-facebook", "~> 8.0.0" -gem "omniauth-google-oauth2", "~> 0.8.2" -gem "omniauth-rails_csrf_protection", "~> 0.1.2" +gem "omniauth-google-oauth2", "~> 1.0.0" +gem "omniauth-rails_csrf_protection", "~> 1.0.0" gem "omniauth-twitter", "~> 1.4.0" gem "paperclip", "~> 6.1.0" gem "paranoia", "~> 2.4.3" diff --git a/Gemfile.lock b/Gemfile.lock index bdd9d6b45..cc8fedee0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -403,25 +403,26 @@ GEM octokit (4.21.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - omniauth (1.9.1) + omniauth (2.0.4) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) + rack-protection omniauth-facebook (8.0.0) omniauth-oauth2 (~> 1.2) - omniauth-google-oauth2 (0.8.2) + omniauth-google-oauth2 (1.0.0) jwt (>= 2.0) oauth2 (~> 1.1) - omniauth (~> 1.1) - omniauth-oauth2 (>= 1.6) - omniauth-oauth (1.1.0) + omniauth (~> 2.0) + omniauth-oauth2 (~> 1.7.1) + omniauth-oauth (1.2.0) oauth - omniauth (~> 1.0) + omniauth (>= 1.0, < 3) omniauth-oauth2 (1.7.1) oauth2 (~> 1.4) omniauth (>= 1.9, < 3) - omniauth-rails_csrf_protection (0.1.2) + omniauth-rails_csrf_protection (1.0.0) actionpack (>= 4.2) - omniauth (>= 1.3.1) + omniauth (~> 2.0) omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack @@ -468,6 +469,8 @@ GEM rack (2.2.3) rack-accept (0.4.5) rack (>= 0.4) + rack-protection (2.1.0) + rack rack-proxy (0.7.0) rack rack-test (1.1.0) @@ -742,10 +745,10 @@ DEPENDENCIES letter_opener_web (~> 1.4.0) mdl (~> 0.11.0) newrelic_rpm (~> 4.1.0.333) - omniauth (~> 1.9.1) + omniauth (~> 2.0.4) omniauth-facebook (~> 8.0.0) - omniauth-google-oauth2 (~> 0.8.2) - omniauth-rails_csrf_protection (~> 0.1.2) + omniauth-google-oauth2 (~> 1.0.0) + omniauth-rails_csrf_protection (~> 1.0.0) omniauth-twitter (~> 1.4.0) paperclip (~> 6.1.0) paranoia (~> 2.4.3)