From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 28 Feb 2018 07:55:28 +0000 (+0800)
Subject: Merge branch 'master' into moderation
X-Git-Tag: live~2989^2~44
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/a20e28809f5ca1e3f3579faeaf118fff3ecc4994

Merge branch 'master' into moderation
---

a20e28809f5ca1e3f3579faeaf118fff3ecc4994
diff --cc Gemfile.lock
index 601477824,bbfb73c5a..02bb3e5fd
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -2,20 -2,19 +2,20 @@@ GE
    remote: https://rubygems.org/
    specs:
      SystemTimer (1.2.3)
 +    aasm (4.1.0)
-     actioncable (5.1.4)
-       actionpack (= 5.1.4)
+     actioncable (5.1.5)
+       actionpack (= 5.1.5)
        nio4r (~> 2.0)
        websocket-driver (~> 0.6.1)
-     actionmailer (5.1.4)
-       actionpack (= 5.1.4)
-       actionview (= 5.1.4)
-       activejob (= 5.1.4)
+     actionmailer (5.1.5)
+       actionpack (= 5.1.5)
+       actionview (= 5.1.5)
+       activejob (= 5.1.5)
        mail (~> 2.5, >= 2.5.4)
        rails-dom-testing (~> 2.0)
-     actionpack (5.1.4)
-       actionview (= 5.1.4)
-       activesupport (= 5.1.4)
+     actionpack (5.1.5)
+       actionview (= 5.1.5)
+       activesupport (= 5.1.5)
        rack (~> 2.0)
        rack-test (>= 0.6.3)
        rails-dom-testing (~> 2.0)