From: Tom Hughes <tom@compton.nu>
Date: Tue, 10 Nov 2020 09:39:49 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2950' into master
X-Git-Tag: live~1844
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e99692fae85066fbfcc1bae99ebb29974104e3bc?hp=e3a4cfd420ecd20aed61d843407643aad30ecd58

Merge remote-tracking branch 'upstream/pull/2950' into master
---

diff --git a/Gemfile.lock b/Gemfile.lock
index 20088beee..1d868a95b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -83,7 +83,7 @@ GEM
     aws-sdk-kms (1.39.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.83.2)
+    aws-sdk-s3 (1.84.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
@@ -254,7 +254,7 @@ GEM
     kramdown (2.3.0)
       rexml
     libxml-ruby (3.2.1)
-    listen (3.2.1)
+    listen (3.3.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logstash-event (1.2.02)
diff --git a/INSTALL.md b/INSTALL.md
index 28a4ee9ad..e3c5299a5 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -32,7 +32,7 @@ sudo apt-get install ruby2.7 libruby2.7 ruby2.7-dev bundler \
                      libmagickwand-dev libxml2-dev libxslt1-dev nodejs \
                      apache2 apache2-dev build-essential git-core firefox-geckodriver \
                      postgresql postgresql-contrib libpq-dev libsasl2-dev \
-                     imagemagick libffi-dev libgd-dev libarchive-dev libbz2-dev
+                     imagemagick libffi-dev libgd-dev libarchive-dev libbz2-dev yarnpkg
 sudo gem2.7 install bundler
 ```