Merge pull request #6905 from kennyj/add_changelog_entry_20120629

Added a changelog entry about fda2431.
rails · Jun 29, 2012 · e39f218 · e39f218
2 parents 809bdf3 + 8fe458a
commit e39f218
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
@@ -1,5 +1,20 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   Add `collate` and `ctype` support to PostgreSQL. These are available for PostgreSQL 8.4 or later.
+    Example:
+
+      development:
+        adapter: postgresql
+        host: localhost
+        database: rails_development
+        username: foo
+        password: bar
+        encoding: UTF8
+        collate: ja_JP.UTF8
+        ctype: ja_JP.UTF8
+
+    *kennyj*
+
 *   `FinderMethods#exists?` now returns `false` with the `false` argument.
 
     *Egor Lynko*