aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-03-26 16:43:22 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-03-26 16:43:22 -0300
commit83429b1ece4b793fba1b6b1bfad1d0de454c3de0 (patch)
tree68d6895eb635a4274371512aa5d8c89c8994674d /actionview/lib
parentc26ee64b9211c92f4826fb935c615fbfa9d35821 (diff)
parent58130cf1fe0974be69c297dd4e7abf3eb1693419 (diff)
downloadrails-83429b1ece4b793fba1b6b1bfad1d0de454c3de0.tar.gz
rails-83429b1ece4b793fba1b6b1bfad1d0de454c3de0.tar.bz2
rails-83429b1ece4b793fba1b6b1bfad1d0de454c3de0.zip
Merge pull request #19536 from JuanitoFatas/doc/av-determine_template
Add missing :html option in determine_template error message.
Diffstat (limited to 'actionview/lib')
-rw-r--r--actionview/lib/action_view/renderer/template_renderer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/renderer/template_renderer.rb b/actionview/lib/action_view/renderer/template_renderer.rb
index cd21d7ab47..dbb4855e39 100644
--- a/actionview/lib/action_view/renderer/template_renderer.rb
+++ b/actionview/lib/action_view/renderer/template_renderer.rb
@@ -40,7 +40,7 @@ module ActionView
find_template(options[:template], options[:prefixes], false, keys, @details)
end
else
- raise ArgumentError, "You invoked render but did not give any of :partial, :template, :inline, :file, :plain, :text or :body option."
+ raise ArgumentError, "You invoked render but did not give any of :partial, :template, :inline, :file, :plain, :html, :text or :body option."
end
end