From: Tom Hughes <tom@compton.nu>
Date: Wed, 25 Oct 2017 07:16:33 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1652'
X-Git-Tag: live~3242
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/38640e0253e8984974d275f2c232eb057ba86c84?ds=sidebyside

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

38640e0253e8984974d275f2c232eb057ba86c84
diff --cc Gemfile.lock
index 046f8a462,e4b521c1a..653098e8e
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -43,12 -43,9 +43,12 @@@ GE
        tzinfo (~> 1.1)
      addressable (2.5.2)
        public_suffix (>= 2.0.2, < 4.0)
 +    annotate (2.7.2)
 +      activerecord (>= 3.2, < 6.0)
 +      rake (>= 10.4, < 13.0)
-     arel (7.1.4)
+     arel (8.0.0)
      ast (2.3.0)
-     autoprefixer-rails (7.1.4.1)
+     autoprefixer-rails (7.1.5)
        execjs
      bigdecimal (1.1.0)
      builder (3.2.3)