aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2013-03-20 01:10:19 -0700
committerVijay Dev <vijaydev.cse@gmail.com>2013-03-20 01:10:19 -0700
commiteda39084fa9198083c4e758d052fa862354a0a7e (patch)
tree09860d8fe85fc4c1f5e6446d8860c6b84bfd2aab
parente61cdf02896ffe0a97cc2205a1a812d54638e19a (diff)
parentb0f727880a7a3e907470937b74a7e573615b57e5 (diff)
downloadrails-eda39084fa9198083c4e758d052fa862354a0a7e.tar.gz
rails-eda39084fa9198083c4e758d052fa862354a0a7e.tar.bz2
rails-eda39084fa9198083c4e758d052fa862354a0a7e.zip
Merge pull request #9825 from rShetty/patch-1
Fix a typo
-rw-r--r--activerecord/CHANGELOG.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 79247e3028..49cec07ed0 100644
--- a/activerecord/CHANGELOG.md
+++ b/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: