diff options
author | Jon Leighton <j@jonathanleighton.com> | 2012-07-26 01:07:02 -0700 |
---|---|---|
committer | Jon Leighton <j@jonathanleighton.com> | 2012-07-26 01:07:02 -0700 |
commit | 88c205ba5313afaf4ba7e0ace43274a2c84a653b (patch) | |
tree | 92555ac3b58d1c85d82dec68817a5c61b236ca06 /activerecord | |
parent | 07c455d94f0439d243382eac56808bc4e36338d2 (diff) | |
parent | c046a29a3223c2dde64edb8509486a13f275aa15 (diff) | |
download | rails-88c205ba5313afaf4ba7e0ace43274a2c84a653b.tar.gz rails-88c205ba5313afaf4ba7e0ace43274a2c84a653b.tar.bz2 rails-88c205ba5313afaf4ba7e0ace43274a2c84a653b.zip |
Merge pull request #7166 from ayrton/patch-1
Update activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/CHANGELOG.md | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index bc355f1ee7..c9f131c74c 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -52,11 +52,11 @@ * `ActiveRecord::Relation#inspect` now makes it clear that you are dealing with a `Relation` object rather than an array:. - User.where(:age => 30).inspect - # => <ActiveRecord::Relation [#<User ...>, #<User ...>, ...]> + User.where(:age => 30).inspect + # => <ActiveRecord::Relation [#<User ...>, #<User ...>, ...]> - User.where(:age => 30).to_a.inspect - # => [#<User ...>, #<User ...>] + User.where(:age => 30).to_a.inspect + # => [#<User ...>, #<User ...>] The number of records displayed will be limited to 10. @@ -65,15 +65,15 @@ * Add `collation` 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 - collation: ja_JP.UTF8 - ctype: ja_JP.UTF8 + development: + adapter: postgresql + host: localhost + database: rails_development + username: foo + password: bar + encoding: UTF8 + collation: ja_JP.UTF8 + ctype: ja_JP.UTF8 *kennyj* |