From: Tom Hughes <tom@compton.nu>
Date: Tue, 15 Sep 2020 07:06:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2828'
X-Git-Tag: live~3026
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4eedff4ab7ef4cbd007a4d30d411012ec265f38e?hp=0b790ea6b400758e5dc24c6931bbe3c9951990da

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

diff --git a/Gemfile.lock b/Gemfile.lock
index a82a33491..38991f57f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -241,7 +241,7 @@ GEM
       sprockets
     image_size (2.0.2)
     in_threads (1.5.4)
-    jbuilder (2.10.0)
+    jbuilder (2.10.1)
       activesupport (>= 5.0.0)
     jmespath (1.4.0)
     jquery-rails (4.4.0)
diff --git a/yarn.lock b/yarn.lock
index ae32beb01..fb4b5048b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -236,9 +236,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.8.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.8.1.tgz#e59de3573fb6a5be8ff526c791571646d124a8fa"
-  integrity sha512-/2rX2pfhyUG0y+A123d0ccXtMm7DV7sH1m3lk9nk2DZ2LReq39FXHueR9xZwshE5MdfSf0xunSaMWRqyIA6M1w==
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.9.0.tgz#522aeccc5c3a19017cf0cb46ebfd660a79acf337"
+  integrity sha512-V6QyhX21+uXp4T+3nrNfI3hQNBDa/P8ga7LoQOenwrlEFXrEnUEE+ok1dMtaS3b6rmLXhT1TkTIsG75HMLbknA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@eslint/eslintrc" "^0.1.3"