diff --git a/Gemfile b/Gemfile index 623db5d9a0..32dcec1e5a 100644 --- a/Gemfile +++ b/Gemfile @@ -39,7 +39,7 @@ gem 'activemerchant', '~> 1.78' gem 'devise', '~> 2.2.5' gem 'devise-encryptable', '0.2.0' gem 'jwt', '~> 2.2' -gem 'oauth2', '~> 1.4.1' # Used for Stripe Connect +gem 'oauth2', '~> 1.4.2' # Used for Stripe Connect gem 'daemons' gem 'delayed_job_active_record' diff --git a/Gemfile.lock b/Gemfile.lock index 9fb8456928..0257b5d9f9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -491,8 +491,8 @@ GEM newrelic_rpm (3.18.1.330) nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) - oauth2 (1.4.1) - faraday (>= 0.8, < 0.16.0) + oauth2 (1.4.2) + faraday (>= 0.8, < 2.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) @@ -777,7 +777,7 @@ DEPENDENCIES momentjs-rails newrelic_rpm (~> 3.0) nokogiri (>= 1.6.7.1) - oauth2 (~> 1.4.1) + oauth2 (~> 1.4.2) ofn-qz! oj order_management!