aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG
diff options
context:
space:
mode:
authorJamis Buck <jamis@37signals.com>2005-05-30 09:00:46 +0000
committerJamis Buck <jamis@37signals.com>2005-05-30 09:00:46 +0000
commitf8542a64b30bb6f67bcedf0c82de1291aab3c3d9 (patch)
tree375ae117198ca6f03526a0cbfcfc9f1729bf6027 /actionpack/CHANGELOG
parentf57ee365e154ce6d15cd168112d94a9a8ff27094 (diff)
downloadrails-f8542a64b30bb6f67bcedf0c82de1291aab3c3d9.tar.gz
rails-f8542a64b30bb6f67bcedf0c82de1291aab3c3d9.tar.bz2
rails-f8542a64b30bb6f67bcedf0c82de1291aab3c3d9.zip
Make sure the benchmarking render method always returns the result of the render, regardless of whether logging is enabled or not.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1371 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/CHANGELOG')
-rw-r--r--actionpack/CHANGELOG2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 9bac83a0e6..658d346056 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Make sure the benchmarking render method always returns the output of the render.
+
* render(:text), render(:partial), and render(:nothing) always default to :layout => false. This also fixes send_file, which was applying a layout if one existed for the current action.
* verify with :redirect_to won't redirect if a redirect or render has already been performed #1350