Merge branch 'master' into HEAD

[rails.git] / config / travis.database.yml

diff --git a/config/travis.database.yml b/config/travis.database.yml
new file mode 100644 (file)
index 0000000..43737f0
--- /dev/null
+++ b/config/travis.database.yml
@@ -0,0 +1,5 @@
+test:
+  adapter: postgresql
+  database: openstreetmap
+  username: postgres
+  encoding: utf8