From: Tom Hughes <tom@compton.nu>
Date: Mon, 3 Aug 2020 07:44:51 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2750'
X-Git-Tag: live~3002
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/864bde05a859a384f83f77c31825e00f01bef5df?hp=2c5836b18a5a7773b2036e18ddd3b76b30f48ebe

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 9e950374e..2eeb85e3b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    aasm (5.0.8)
+    aasm (5.1.0)
       concurrent-ruby (~> 1.0)
     actioncable (6.0.3.2)
       actionpack (= 6.0.3.2)
@@ -52,7 +52,7 @@ GEM
     activerecord (6.0.3.2)
       activemodel (= 6.0.3.2)
       activesupport (= 6.0.3.2)
-    activerecord-import (1.0.5)
+    activerecord-import (1.0.6)
       activerecord (>= 3.2)
     activestorage (6.0.3.2)
       actionpack (= 6.0.3.2)
diff --git a/yarn.lock b/yarn.lock
index a30544705..86db5ca5b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -215,9 +215,9 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
 eslint@^7.3.1:
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.5.0.tgz#9ecbfad62216d223b82ac9ffea7ef3444671d135"
-  integrity sha512-vlUP10xse9sWt9SGRtcr1LAC67BENcQMFeV+w5EvLEoFe3xJ8cF1Skd0msziRx/VMC+72B4DxreCE+OR12OA6Q==
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.6.0.tgz#522d67cfaea09724d96949c70e7a0550614d64d6"
+  integrity sha512-QlAManNtqr7sozWm5TF4wIH9gmUm2hE3vNRUvyoYAa4y1l5/jxD/PQStEjBMQtCqZmSep8UxrcecI60hOpe61w==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     ajv "^6.10.0"