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

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

71f2b6d1cd3fce606af65e04cff988cc59159282
diff --combined Gemfile.lock
index 1e8e3d91f,69e32988d..0592bbff9
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -71,7 -71,7 +71,7 @@@ GE
        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 +104,7 @@@
      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)