Permalink
Browse files

Merge branch 'master' of https://github.com/rails/rails

  • Loading branch information...
2 parents 1cf1ea7 + eda3908 commit d9d7134d5e7bd74c772fb2c17581a5a75211ce3d @anupamc anupamc committed Mar 20, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 activerecord/CHANGELOG.md
@@ -525,7 +525,7 @@
*Justin George*
-* The database adpters now converts the options passed thought `DATABASE_URL`
+* The database adapters now converts the options passed thought `DATABASE_URL`
environment variable to the proper Ruby types before using. For example, SQLite requires
that the timeout value is an integer, and PostgreSQL requires that the
prepared_statements option is a boolean. These now work as expected:

0 comments on commit d9d7134

Please sign in to comment.