Merge branch 'master' into tag-colour-preview-rebase

[rails.git] / script / vagrant / setup / provision.sh

diff --git a/script/vagrant/setup/provision.sh b/script/vagrant/setup/provision.sh
index 2ab14c36de968810542817265730332285ddcb1b..c181376c9badeb042e8572b5f8052d67d79d9f57 100644 (file)
--- a/script/vagrant/setup/provision.sh
+++ b/script/vagrant/setup/provision.sh
@@ -49,6 +49,7 @@ popd
 if [ ! -f config/database.yml ]; then
     sudo -u vagrant cp config/example.database.yml config/database.yml
 fi
+touch config/settings.local.yml
 # migrate the database to the latest version
 sudo -u vagrant rake db:migrate
 popd