Merge branch 'master' into #3311-upgrade-solr-to-7

Gemfile

@@ -112,7 +112,7 @@ group :test do
   gem 'simplecov'
   # Faker added 0.5 seconds to the test suite per call. Haikunator seems much faster for faking strings
   gem 'haikunator'
-  gem 'shoulda-matchers', '~> 6.1'
+  gem 'shoulda-matchers', '~> 6.2'
 
   gem 'json-schema', '~> 4.2.0'
   gem 'launchy'

Gemfile.lock

@@ -141,7 +141,7 @@ GEM
       erubi (~> 1.4)
       parser (>= 2.4)
       smart_properties
-    bigdecimal (3.1.6)
+    bigdecimal (3.1.7)
     bindex (0.8.1)
     binding_of_caller (1.0.1)
       debug_inspector (>= 1.2.0)
@@ -205,8 +205,7 @@ GEM
       activesupport (>= 5.0)
       request_store (>= 1.0)
       ruby2_keywords
-    drb (2.2.0)
-      ruby2_keywords
+    drb (2.2.1)
     ebnf (2.4.0)
       htmlentities (~> 4.3)
       rdf (~> 3.3)
@@ -338,7 +337,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.22.2)
+    minitest (5.22.3)
     minitest-retry (0.2.2)
       minitest (>= 5.0)
     msgpack (1.7.2)
@@ -361,7 +360,7 @@ GEM
       net-protocol
     nio4r (2.7.0)
     no_proxy_fix (0.1.2)
-    nokogiri (1.16.2)
+    nokogiri (1.16.3)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     octokit (8.1.0)
@@ -532,7 +531,7 @@ GEM
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    shoulda-matchers (6.1.0)
+    shoulda-matchers (6.2.0)
       activesupport (>= 5.2.0)
     sidekiq (7.2.2)
       concurrent-ruby (< 2)
@@ -685,7 +684,7 @@ DEPENDENCIES
   rubocop-rails
   sdoc
   selenium-webdriver
-  shoulda-matchers (~> 6.1)
+  shoulda-matchers (~> 6.2)
   sidekiq (~> 7.2)
   sidekiq-cron (~> 1.12)
   sidekiq-unique-jobs (~> 8.0)