From: Tom Hughes <tom@compton.nu>
Date: Tue, 3 Nov 2020 19:19:28 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2931' into master
X-Git-Tag: live~3097
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/984ba584ea20432e31146935596dbeb9bdd8eed2?hp=bca801a226646050fea680a5151ce0bdc7fbca31

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

diff --git a/Gemfile.lock b/Gemfile.lock
index cebb19d32..0592bbff9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -71,7 +71,7 @@ GEM
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.1)
-    autoprefixer-rails (10.0.1.1)
+    autoprefixer-rails (10.0.1.2)
       execjs
     aws-eventstream (1.1.0)
     aws-partitions (1.383.0)
@@ -104,7 +104,7 @@ GEM
     bigdecimal (1.1.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.4.9)
+    bootsnap (1.5.0)
       msgpack (~> 1.0)
     bootstrap (4.5.2)
       autoprefixer-rails (>= 9.1.0)