Merge remote-tracking branch 'upstream/pull/2958' into master

diff --git a/Gemfile.lock b/Gemfile.lock
index aeac9879a9cab12055bb46157b786820bad88966..3b489344aea2e0acf0009cead8120be11cac4523 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -131,7 +131,7 @@ GEM
       xpath (~> 3.2)
     childprocess (3.0.0)
     coderay (1.1.3)
-    composite_primary_keys (12.0.2)
+    composite_primary_keys (12.0.3)
       activerecord (~> 6.0.0)
     concurrent-ruby (1.1.7)
     config (2.2.1)