From: Tom Hughes <tom@compton.nu>
Date: Sat, 16 Mar 2019 15:39:03 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2177'
X-Git-Tag: live~3242
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/e3ed9988ce5f57ed303326072f7f583b641e8774?ds=inline;hp=--cc

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

e3ed9988ce5f57ed303326072f7f583b641e8774
diff --cc Gemfile.lock
index e7e391417,702ee49a1..2b5cc1dd5
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -91,7 -91,11 +91,11 @@@ GE
      coffee-script-source (1.12.2)
      composite_primary_keys (11.1.0)
        activerecord (~> 5.2.1)
 -    concurrent-ruby (1.1.4)
 +    concurrent-ruby (1.1.5)
+     config (1.7.1)
+       activesupport (>= 3.0)
+       deep_merge (~> 1.2.1)
+       dry-validation (>= 0.12.2)
      coveralls (0.8.22)
        json (>= 1.8, < 3)
        simplecov (~> 0.16.1)