From: Tom Hughes <tom@compton.nu>
Date: Thu, 24 Sep 2020 10:40:33 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2848'
X-Git-Tag: live~2890
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/a02a7839046bc10b232080916d545936432e65a3?hp=-c

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

a02a7839046bc10b232080916d545936432e65a3
diff --combined Gemfile.lock
index ee7e25215,68de1f478..fae8b8594
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -114,7 -114,7 +114,7 @@@ GE
        actionpack (>= 5.2)
        activemodel (>= 5.2)
      brakeman (4.9.1)
-     browser (4.2.0)
+     browser (5.0.0)
      builder (3.2.4)
      bzip2-ffi (1.0.0)
        ffi (~> 1.0)
@@@ -390,7 -390,7 +390,7 @@@
      rexml (3.2.4)
      rinku (2.0.6)
      rotp (6.1.0)
 -    rubocop (0.91.0)
 +    rubocop (0.91.1)
        parallel (~> 1.10)
        parser (>= 2.7.1.1)
        rainbow (>= 2.2.2, < 4.0)