aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-12-21 11:39:39 -0800
committerJosé Valim <jose.valim@gmail.com>2011-12-21 11:39:39 -0800
commita29c681dce81d67d0a3307ec91848cb705d20253 (patch)
tree5a120fcdc44d19249c6c84993d9089be1d6bb021 /actionpack/lib
parentfccc952ccd9ac05f26ebb3419999d7aa3e70e83d (diff)
parent9fbaf9f0777485b32ae12d0cc261695b9bb26eea (diff)
downloadrails-a29c681dce81d67d0a3307ec91848cb705d20253.tar.gz
rails-a29c681dce81d67d0a3307ec91848cb705d20253.tar.bz2
rails-a29c681dce81d67d0a3307ec91848cb705d20253.zip
Merge pull request #4119 from lucasmazza/render_without_options
raises an ArgumentError on TemplateRenderer#determine_template
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/renderer/template_renderer.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb
index 3e3a44b432..06148ccc98 100644
--- a/actionpack/lib/action_view/renderer/template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/template_renderer.rb
@@ -25,6 +25,8 @@ module ActionView
elsif options.key?(:template)
options[:template].respond_to?(:render) ?
options[:template] : find_template(options[:template], options[:prefixes], false, keys, @details)
+ else
+ raise ArgumentError, "You invoked render but did not give any of :partial, :template, :inline, :file or :text option."
end
end