aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-02-23 05:04:35 -0800
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-02-23 05:04:35 -0800
commitcad397ea2bdeec77792201b9f10cedae6b62163b (patch)
treef6cbdefdf4696f45eab8e19bf0bc7bba70491867 /actionpack/lib
parent38f347a825cf132b1e0da9402532b40d6ea68522 (diff)
parentde47fc2c228d9d2dc494954a6897329ddb447349 (diff)
downloadrails-cad397ea2bdeec77792201b9f10cedae6b62163b.tar.gz
rails-cad397ea2bdeec77792201b9f10cedae6b62163b.tar.bz2
rails-cad397ea2bdeec77792201b9f10cedae6b62163b.zip
Merge pull request #9387 from boukevanderbijl/master
Fix debug helper not inspecting when it can't convert to YAML
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/helpers/debug_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/debug_helper.rb b/actionpack/lib/action_view/helpers/debug_helper.rb
index 34fc23ac1a..c29c1b1eea 100644
--- a/actionpack/lib/action_view/helpers/debug_helper.rb
+++ b/actionpack/lib/action_view/helpers/debug_helper.rb
@@ -32,7 +32,7 @@ module ActionView
content_tag(:pre, object, :class => "debug_dump")
rescue Exception # errors from Marshal or YAML
# Object couldn't be dumped, perhaps because of singleton methods -- this is the fallback
- content_tag(:code, object.to_yaml, :class => "debug_dump")
+ content_tag(:code, object.inspect, :class => "debug_dump")
end
end
end