Merge branch 'develop' into dependabot/bundler/develop/doorkeeper-5.5.0

Author: cbaudouinjr

Gemfile

@@ -122,7 +122,7 @@ group :test do
   gem 'factory_bot_rails'
   gem 'codeclimate-test-reporter', '~> 1.0.7', require: nil
   gem 'rails-controller-testing' # Rails 4 fallback
-  gem 'webmock', '~> 3.4'
+  gem 'webmock', '~> 3.12'
   gem 'timecop'
 
   # Adds support for Capybara system testing and selenium driver

Gemfile.lock

@@ -63,7 +63,7 @@ GEM
     autoprefixer-rails (10.2.4.0)
       execjs
     aws-eventstream (1.1.0)
-    aws-partitions (1.427.0)
+    aws-partitions (1.429.0)
     aws-sdk-core (3.112.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
@@ -72,7 +72,7 @@ GEM
     aws-sdk-kms (1.42.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.88.1)
+    aws-sdk-s3 (1.89.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
@@ -114,8 +114,8 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.1.8)
     connection_pool (2.2.3)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
+    crack (0.4.5)
+      rexml
     crass (1.0.6)
     css_parser (1.9.0)
       addressable
@@ -340,6 +340,7 @@ GEM
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
+    rexml (3.2.4)
     roadie (4.0.0)
       css_parser (~> 1.4)
       nokogiri (~> 1.8)
@@ -354,7 +355,6 @@ GEM
     ruby_parser (3.14.2)
       sexp_processor (~> 4.9)
     rubyzip (2.3.0)
-    safe_yaml (1.0.5)
     safely_block (0.3.0)
       errbase (>= 0.1.1)
     sass-rails (6.0.0)
@@ -371,9 +371,9 @@ GEM
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
-    sendgrid-actionmailer (3.1.1)
+    sendgrid-actionmailer (3.2.0)
       mail (~> 2.7)
-      sendgrid-ruby (~> 6.0)
+      sendgrid-ruby (~> 6.4)
     sendgrid-ruby (6.4.0)
       ruby_http_client (~> 3.4)
     sexp_processor (4.15.0)
@@ -438,7 +438,7 @@ GEM
       activemodel (>= 5.0)
       bindex (>= 0.4.0)
       railties (>= 5.0)
-    webmock (3.8.3)
+    webmock (3.12.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -522,7 +522,7 @@ DEPENDENCIES
   valid_attribute
   validate_url
   web-console (>= 3.3.0)
-  webmock (~> 3.4)
+  webmock (~> 3.12)
 
 RUBY VERSION
    ruby 2.6.6p146