From: Tom Hughes <tom@compton.nu>
Date: Thu, 1 Nov 2018 18:01:25 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2037'
X-Git-Tag: live~3341
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/0e7cc08c7b1055341dc01cfdc331fac1a13964c1

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

0e7cc08c7b1055341dc01cfdc331fac1a13964c1
diff --cc Gemfile.lock
index 033fed118,9080f009e..08514dcda
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -97,8 -97,13 +97,13 @@@ GE
      crack (0.4.3)
        safe_yaml (~> 1.0.0)
      crass (1.0.4)
 -    dalli (2.7.8)
 +    dalli (2.7.9)
      debug_inspector (0.0.3)
+     delayed_job (4.1.5)
+       activesupport (>= 3.0, < 5.3)
+     delayed_job_active_record (4.1.3)
+       activerecord (>= 3.0, < 5.3)
+       delayed_job (>= 3.0, < 5)
      docile (1.3.1)
      dynamic_form (1.1.4)
      erubi (1.7.1)