diff options
| -rw-r--r-- | actionpack/CHANGELOG.md | 7 | ||||
| -rw-r--r-- | activerecord/CHANGELOG.md | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 4cf653722f..8c7089cf57 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,6 +1,11 @@ ## Rails 4.0.0 (unreleased) ## -* Add `separation` option for `ActionView::Helpers::TextHelper.excerpt`. *Guirec Corbel* +* Add `separator` option for `ActionView::Helpers::TextHelper#excerpt`: + + excerpt('This is a very beautiful morning', 'very', :separator => ' ', :radius => 1) + # => ...a very beautiful... + + *Guirec Corbel* * Added controller-level etag additions that will be part of the action etag computation *Jeremy Kemper/DHH* diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 7f71c7facf..4bcdf3a536 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,6 +1,9 @@ ## Rails 4.0.0 (unreleased) ## -* `ActiveRecord::SchemaDumper` use the Ruby 1.9 style hash. *Konstantin Shabanov* +* `ActiveRecord::SchemaDumper` uses Ruby 1.9 style hash, which means that the + schema.rb file will be generated using this new syntax from now on. + + *Konstantin Shabanov* * Map interval with precision to string datatype in PostgreSQL. Fixes #7518. *Yves Senn* |