Merge branch 'develop' into dependabot/bundler/develop/aws-sdk-s3-1.89.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.11'
   gem 'timecop'
 
   # Adds support for Capybara system testing and selenium driver

Gemfile.lock

@@ -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)
@@ -438,7 +438,7 @@ GEM
       activemodel (>= 5.0)
       bindex (>= 0.4.0)
       railties (>= 5.0)
-    webmock (3.8.3)
+    webmock (3.11.3)
       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.11)
 
 RUBY VERSION
    ruby 2.6.6p146