aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
diff options
context:
space:
mode:
authorRobin Dupret <robin.dupret@gmail.com>2014-01-04 04:04:12 -0800
committerRobin Dupret <robin.dupret@gmail.com>2014-01-04 04:04:12 -0800
commit81066b115817a4c95c83a76553954317f737cd14 (patch)
treed1854f2358de2e4fbedb848cfab430a22bfa2e0d /actionview
parent27bcec28bfb7272aa2cbe107c10bdafd5ebc32c9 (diff)
parent9882ec4a50eb64d1024740bbd3ebc4cf31b8e0d3 (diff)
downloadrails-81066b115817a4c95c83a76553954317f737cd14.tar.gz
rails-81066b115817a4c95c83a76553954317f737cd14.tar.bz2
rails-81066b115817a4c95c83a76553954317f737cd14.zip
Merge pull request #13587 from kud86/change_truncate_examples
Fixed truncate documentation. [ci skip]
Diffstat (limited to 'actionview')
-rw-r--r--actionview/lib/action_view/helpers/text_helper.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/actionview/lib/action_view/helpers/text_helper.rb b/actionview/lib/action_view/helpers/text_helper.rb
index 9943e19714..7cfbca5b6f 100644
--- a/actionview/lib/action_view/helpers/text_helper.rb
+++ b/actionview/lib/action_view/helpers/text_helper.rb
@@ -82,6 +82,9 @@ module ActionView
# # => "And they f... (continued)"
#
# truncate("<p>Once upon a time in a world far far away</p>")
+ # # => "&lt;p&gt;Once upon a time in a wo..."
+ #
+ # truncate("<p>Once upon a time in a world far far away</p>", escape: false)
# # => "<p>Once upon a time in a wo..."
#
# truncate("Once upon a time in a world far far away") { link_to "Continue", "#" }