Fixed conflict from #5915 pull request
This will need a rebase.
Still says it can't be merged. :/
Restoring the '%' trim mode for ERb templates, allowing for a leading…
… percent sign on a line to indicate non-inserted Ruby code.
CHANGELOG.md gets updated very often, causing conflict. rebased again.
I'm not a fan of this at all. The resulting view code looks like a mess. Going to revert.
Revert "Merge pull request #7033 from kron4eg/master". Not a a fan at…
… all of what this makes ERB files look like.
This reverts commit 46b8bce, reversing
changes made to 2f58795.