diff options
| author | Colin Law <colin@clanlaw.org.uk> | 2009-01-11 12:13:50 +0000 |
|---|---|---|
| committer | Colin Law <colin@clanlaw.org.uk> | 2009-01-11 12:13:50 +0000 |
| commit | 55901d7d86f5608c4a07386ca6378121eb8127cb (patch) | |
| tree | 8ede6a21529dfac8c818a3fe1584fb46f00c03ff /actionpack/CHANGELOG | |
| parent | 3e60ea6c231810e2b850492a86874b4800dfbf27 (diff) | |
| parent | cf4b24407ada79c133fbae1ec7db692882225956 (diff) | |
| download | rails-55901d7d86f5608c4a07386ca6378121eb8127cb.tar.gz rails-55901d7d86f5608c4a07386ca6378121eb8127cb.tar.bz2 rails-55901d7d86f5608c4a07386ca6378121eb8127cb.zip | |
Merge branch 'master' of git@github.com:lifo/docrails
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') |