From: Tom Hughes <tom@compton.nu>
Date: Thu, 23 Jul 2020 20:32:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2731'
X-Git-Tag: live~2870
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/44c45b1fcd854f749aa55b247dfc095f8ae33749?ds=sidebyside;hp=-c

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

44c45b1fcd854f749aa55b247dfc095f8ae33749
diff --combined Gemfile.lock
index 4ae3a72a2,8e990431b..7622adfee
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -104,7 -104,7 +104,7 @@@ GE
      bigdecimal (1.1.0)
      binding_of_caller (0.8.0)
        debug_inspector (>= 0.0.1)
 -    bootsnap (1.4.6)
 +    bootsnap (1.4.7)
        msgpack (~> 1.0)
      bootstrap (4.5.0)
        autoprefixer-rails (>= 9.1.0)
@@@ -221,7 -221,7 +221,7 @@@
      html_tokenizer (0.0.7)
      htmlentities (4.3.4)
      http_accept_language (2.1.1)
-     i18n (1.8.3)
+     i18n (1.8.4)
        concurrent-ruby (~> 1.0)
      i18n-js (3.7.1)
        i18n (>= 0.6.6)
@@@ -439,7 -439,7 +439,7 @@@
        actionpack (>= 4.0)
        activesupport (>= 4.0)
        sprockets (>= 3.0.0)
-     strong_migrations (0.6.8)
+     strong_migrations (0.7.0)
        activerecord (>= 5)
      sync (0.5.0)
      term-ansicolor (1.7.1)
@@@ -466,7 -466,7 +466,7 @@@
      websocket-extensions (0.1.5)
      xpath (3.2.0)
        nokogiri (~> 1.8)
-     zeitwerk (2.3.1)
+     zeitwerk (2.4.0)
  
  PLATFORMS
    ruby