From: Tom Hughes <tom@compton.nu>
Date: Wed, 6 Feb 2019 18:15:40 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2125'
X-Git-Tag: live~3300
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/c18e679be36b95fbf86a1dd5293d74ab70f6db4f?hp=-c

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

c18e679be36b95fbf86a1dd5293d74ab70f6db4f
diff --combined Gemfile.lock
index 6896a07f8,7bd384a9f..17dd71611
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -67,6 -67,7 +67,7 @@@ GE
        debug_inspector (>= 0.0.1)
      bootsnap (1.3.2)
        msgpack (~> 1.0)
+     browser (2.5.3)
      builder (3.2.3)
      cancancan (2.3.0)
      canonical-rails (0.2.5)
@@@ -164,7 -165,7 +165,7 @@@
        jsonify (< 0.4.0)
      jwt (2.1.0)
      kgio (2.11.2)
 -    kramdown (2.0.0)
 +    kramdown (1.17.0)
      libv8 (3.16.14.19)
      libxml-ruby (3.1.0)
      listen (3.1.5)
@@@ -394,6 -395,7 +395,7 @@@ DEPENDENCIE
    bigdecimal (~> 1.1.0)
    binding_of_caller
    bootsnap (>= 1.1.0)
+   browser
    cancancan
    canonical-rails
    capybara (~> 2.13)