diff options
author | Yehuda Katz <wycats@gmail.com> | 2009-01-02 22:16:48 -0800 |
---|---|---|
committer | Yehuda Katz <wycats@gmail.com> | 2009-01-02 22:16:48 -0800 |
commit | a38c749d8b5fd020d7294ffb4d597d4ab3fb30db (patch) | |
tree | e841f423d995c4720576151a1e1d7215ff8ad92c /actionpack/CHANGELOG | |
parent | 42b32938d99d8f930e3020659ec0619aa5205c05 (diff) | |
download | rails-a38c749d8b5fd020d7294ffb4d597d4ab3fb30db.tar.gz rails-a38c749d8b5fd020d7294ffb4d597d4ab3fb30db.tar.bz2 rails-a38c749d8b5fd020d7294ffb4d597d4ab3fb30db.zip |
Sync 'rails/rails/master'
Diffstat (limited to 'actionpack/CHANGELOG')
-rw-r--r-- | actionpack/CHANGELOG | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index a8abf48441..26e40e76d5 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,9 @@ *2.3.0 [Edge]* +* Added :silence option to BenchmarkHelper#benchmark and turned log_level into a hash parameter and deprecated the old use [DHH] + +* Fixed the AssetTagHelper cache to use the computed asset host as part of the cache key instead of just assuming the its a string #1299 [DHH] + * Make ActionController#render(string) work as a shortcut for render :file/:template/:action => string. [#1435] [Pratik Naik] Examples: # Instead of render(:action => 'other_action') |