Conflicts: railties/guides/source/ajax_on_rails.textile railties/guides/source/generators.textile
… argument is a String
…t, giving a overview of the possibilities.
…il and instead implement smarter versions allowing for string class names, also added proper Railtie support with tests. Signed-off-by: José Valim <email@example.com>
[#6550 state:committed] Signed-off-by: Santiago Pastorino <firstname.lastname@example.org>
This was conflicting with ActionView::Helpers::TextHelper#simple_format from within email templates.
Please excuse the revert. Albeit the commit is totally innocent, docrails has a strong no-code policy we need to enforce. Please feel free to submit the fix as a patch and assign it to me, I'll apply right away. This reverts commit d846251.