From: Tom Hughes Date: Wed, 26 Apr 2023 17:19:52 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/4023' X-Git-Tag: live~1788 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ce256ee661d92aff564825fa8e5768d8dca6725b?hp=697849f78d66c3da4361848feccc1de2cf8d5f36 Merge remote-tracking branch 'upstream/pull/4023' --- diff --git a/script/vagrant/setup/provision.sh b/script/vagrant/setup/provision.sh index 2ca780ff1..afabc4885 100644 --- a/script/vagrant/setup/provision.sh +++ b/script/vagrant/setup/provision.sh @@ -21,7 +21,6 @@ apt-get install -y ruby2.7 libruby2.7 ruby2.7-dev \ build-essential git-core firefox-geckodriver \ postgresql postgresql-contrib libpq-dev libvips-dev \ libsasl2-dev libffi-dev libgd-dev libarchive-dev libbz2-dev -gem2.7 install rake gem2.7 install --version "~> 2.1.4" bundler ## install the bundle necessary for openstreetmap-website @@ -47,5 +46,5 @@ if [ ! -f config/storage.yml ]; then fi touch config/settings.local.yml # migrate the database to the latest version -sudo -u vagrant bundle exec rake db:migrate +sudo -u vagrant bundle exec rails db:migrate popd