aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller/rendering.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-01-20 14:41:23 +0100
committerJosé Valim <jose.valim@gmail.com>2010-01-20 15:02:13 +0100
commit6e26be69606c52dbccfad366661b455157c35be4 (patch)
treea93b713b2d89cbab601fabfe1c2f54e21415e673 /actionpack/lib/abstract_controller/rendering.rb
parent8e2fd54b19656a6edbd94f8707927d09e167e7fc (diff)
downloadrails-6e26be69606c52dbccfad366661b455157c35be4.tar.gz
rails-6e26be69606c52dbccfad366661b455157c35be4.tar.bz2
rails-6e26be69606c52dbccfad366661b455157c35be4.zip
Move ActionController::Translation to AbstractController::Translation.
Diffstat (limited to 'actionpack/lib/abstract_controller/rendering.rb')
-rw-r--r--actionpack/lib/abstract_controller/rendering.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index 644419a585..826e82c8c6 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -42,7 +42,7 @@ module AbstractController
# Delegates render_to_body and sticks the result in self.response_body.
def render(*args, &block)
if response_body
- raise AbstractController::DoubleRenderError, "Can only render or redirect once per action"
+ raise AbstractController::DoubleRenderError
end
options = _normalize_options(*args, &block)