Merge remote-tracking branch 'upstream/pull/4315'

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 5c8f713e1238489f0e1a6559a2ba9f71285ad956..80f7b2936b559e3763e2d2d457a3cceb822b66a3 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,22 +1,11 @@
 GIT
-  remote: https://github.com/gravitystorm/bootstrap-rubygem.git
-  revision: 7bd2caa8a2897a55892915a789d4e020906adb60
-  branch: dartsass_5_2_3
+  remote: https://github.com/twbs/bootstrap-rubygem.git
+  revision: fde1edff90d9219bbef48ecc6a65f13835269bcd
+  ref: fde1edff90d9219bbef48ecc6a65f13835269bcd
   specs:
-    bootstrap (5.2.3)
+    bootstrap (5.3.1)
       autoprefixer-rails (>= 9.1.0)
-      popper_js (>= 2.11.6, < 3)
-
-GIT
-  remote: https://github.com/tomhughes/canonical-rails.git
-  revision: e368572f7a3b609c73cc3d37d8e00d963c5e29f0
-  branch: rails71
-  specs:
-    canonical-rails (0.2.14)
-      actionmailer (>= 4.1, < 7.2)
-      activerecord (>= 4.1, < 7.2)
-      railties (>= 4.1, < 7.2)
-      sprockets-rails (~> 3.0)
+      popper_js (>= 2.11.8, < 3)
 
 GEM
   remote: https://rubygems.org/
@@ -114,7 +103,7 @@ GEM
     autoprefixer-rails (10.4.15.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.836.0)
+    aws-partitions (1.840.0)
     aws-sdk-core (3.185.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
@@ -156,6 +145,8 @@ GEM
     bzip2-ffi (1.1.1)
       ffi (~> 1.0)
     cancancan (3.5.0)
+    canonical-rails (0.2.15)
+      actionview (>= 4.1, <= 7.2)
     capybara (3.39.2)
       addressable
       matrix
@@ -166,7 +157,7 @@ GEM
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     concurrent-ruby (1.2.2)
-    config (4.2.1)
+    config (5.0.0)
       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)
     connection_pool (2.4.1)
@@ -339,13 +330,13 @@ GEM
     maxminddb (0.1.22)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.4)
+    mini_portile2 (2.8.5)
     minitest (5.20.0)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     mutex_m (0.1.2)
-    net-imap (0.4.1)
+    net-imap (0.4.2)
       date
       net-protocol
     net-pop (0.1.2)
@@ -478,7 +469,7 @@ GEM
       ffi (~> 1.0)
     rdoc (6.5.0)
       psych (>= 4.0.0)
-    regexp_parser (2.8.1)
+    regexp_parser (2.8.2)
     reline (0.3.9)
       io-console (~> 0.5)
     request_store (1.5.1)
@@ -505,7 +496,7 @@ GEM
       rubocop (~> 1.41)
     rubocop-factory_bot (2.24.0)
       rubocop (~> 1.33)
-    rubocop-minitest (0.32.2)
+    rubocop-minitest (0.33.0)
       rubocop (>= 1.39, < 2.0)
     rubocop-performance (1.19.1)
       rubocop (>= 1.7.0, < 2.0)
@@ -518,7 +509,7 @@ GEM
       rubocop (~> 1.0)
     ruby-openid (2.9.2)
     ruby-progressbar (1.13.0)
-    ruby-vips (2.1.4)
+    ruby-vips (2.2.0)
       ffi (~> 1.12)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
@@ -555,13 +546,13 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     stringio (3.0.8)
-    strong_migrations (1.6.3)
+    strong_migrations (1.6.4)
       activerecord (>= 5.2)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    terser (1.1.18)
+    terser (1.1.19)
       execjs (>= 0.3.0, < 3)
-    thor (1.2.2)
+    thor (1.3.0)
     tilt (2.3.0)
     timeout (0.4.0)
     tzinfo (2.0.6)
@@ -605,7 +596,7 @@ DEPENDENCIES
   browser
   bzip2-ffi
   cancancan
-  canonical-rails!
+  canonical-rails
   capybara (>= 2.15)
   config
   connection_pool