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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index fbde32df6..77aa0e4d7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -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
 ```