Merge remote-tracking branch 'upstream/pull/2509'

[rails.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index b950b1e18e2cbf8083078758a08702d7493c267a..31f4aec537856ac9ed3e2a8bc0de3903f792a79b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,8 @@ before_script:
   - psql -U postgres -f db/functions/functions.sql openstreetmap
   - cp config/travis.database.yml config/database.yml
   - cp config/example.storage.yml config/storage.yml
-  - echo -e "---\nmemcache_servers:\n  - 127.0.0.1" > config/settings.local.yml
+  - touch config/settings.local.yml
+  - echo -e "---\nmemcache_servers:\n  - 127.0.0.1" > config/settings/test.local.yml
   - bundle exec rake db:migrate
   - bundle exec rake i18n:js:export
   - bundle exec rake yarn:install