]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'upstream/pull/2949' into master
authorTom Hughes <tom@compton.nu>
Tue, 10 Nov 2020 09:39:46 +0000 (09:39 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 10 Nov 2020 09:39:46 +0000 (09:39 +0000)
Gemfile.lock
INSTALL.md

index fbde32df6e525ad258276645d8675dece7027d12..77aa0e4d77d97365d9156ab70b29d7084e8be862 100644 (file)
@@ -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)
index 28a4ee9adc23210e62548e1e17f1fac87ee7b416..e3c5299a5ac473bde497ebb9becc1ed4c9892a88 100644 (file)
@@ -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
 ```