diff --git a/Gemfile b/Gemfile index 643bb49d22..5c5f38536f 100644 --- a/Gemfile +++ b/Gemfile @@ -34,7 +34,7 @@ gem 'x-editable-rails', '~> 1.5', '>= 1.5.5.1' gem 'select2-rails', '~> 3.5.9.3' gem 'doorkeeper', '~> 4.4', '>= 4.4.3' gem 'devise_token_auth', '~> 0.1.37' -gem 'omniauth', '~> 1.3', '>= 1.3.1' +gem 'omniauth', '~> 2.0' gem 'jquery-validation-rails' gem 'google-api-client', '~> 0.10', require: 'google/apis/calendar_v3' gem 'google_calendar', '~> 0.6.4' diff --git a/Gemfile.lock b/Gemfile.lock index fbbabd0e34..b44ec05412 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -436,7 +436,7 @@ GEM haml (>= 4.0.6, < 5.0) html2haml (>= 1.0.1) railties (>= 4.0.1) - hashie (4.1.0) + hashie (5.0.0) html-pipeline (2.4.2) activesupport (>= 2) nokogiri (>= 1.4) @@ -581,9 +581,10 @@ GEM octokit (4.19.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - omniauth (1.9.1) + omniauth (2.0.0) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) + rack-protection open4 (1.3.4) optimist (3.0.1) origin (2.3.1) @@ -945,7 +946,7 @@ DEPENDENCIES mongoid (~> 5.2, >= 5.2.1) mongoid-rspec (~> 4.0, >= 4.0.1) neat (~> 1.8) - omniauth (~> 1.3, >= 1.3.1) + omniauth (~> 2.0) paper_trail (~> 5.2) pg (~> 0.18.4) phantomjs