Restore "%" ERb/Erubis Trim Mode #7033

Merged
merged 1 commit into from Aug 7, 2012

Projects

None yet

5 participants

@kron4eg
Contributor
kron4eg commented Jul 11, 2012

Fixed conflict from #5915 pull request

@JEG2
JEG2 commented Jul 11, 2012

Sweet. Thanks!

@steveklabnik
Member

This will need a rebase.

@kron4eg
Contributor
kron4eg commented Aug 6, 2012

@steveklabnik rebased

@steveklabnik
Member

Still says it can't be merged. :/

@kron4eg kron4eg Restoring the '%' trim mode for ERb templates, allowing for a leading…
… percent sign on a line to indicate non-inserted Ruby code.
e82ffea
@kron4eg
Contributor
kron4eg commented Aug 7, 2012

CHANGELOG.md gets updated very often, causing conflict. rebased again.

@spastorino spastorino merged commit 46b8bce into rails:master Aug 7, 2012
@dhh
Member
dhh commented Aug 7, 2012

I'm not a fan of this at all. The resulting view code looks like a mess. Going to revert.

@dhh dhh added a commit that referenced this pull request Aug 7, 2012
@dhh dhh 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.
666d3fd
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment