Permalink
Commits on Dec 17, 2011
  1. Merge branch 'stable'

    Conflicts:
    	doc-src/HAML_CHANGELOG.md
    nex3 committed Dec 17, 2011
Commits on Dec 16, 2011
  1. Attribute escaping respects html_safe.

    It's sometimes the case where we don't want attributes to be
    html_escaped... for instance `%input{ placeholder: 'Filter…' }`.
    
    This commit changes the attribute escaping to respect the rails
    `html_safe` flag and not escape attributes when `.html_safe` is
    explicitly called on them.
    
    Closes #470
    gerad committed with nex3 Dec 13, 2011
Commits on Nov 28, 2011
  1. Fix rake:revision_file.

    nex3 committed Nov 28, 2011
  2. Merge branch 'stable'

    Conflicts:
    	VERSION
    	doc-src/HAML_CHANGELOG.md
    nex3 committed Nov 28, 2011
  3. Bump VERSION to 3.1.4.

    nex3 committed Nov 28, 2011
  4. Update vendored Sass.

    Closes gh-447
    nex3 committed Nov 28, 2011
Commits on Nov 24, 2011
  1. Merge branch 'stable'

    nex3 committed Nov 24, 2011
  2. Revert "Merge pull request #433 from infbio/form_for_pull"

    This reverts commit c7a6273, reversing
    changes made to 14ec488.
    nex3 committed Nov 24, 2011
  3. Merge remote branch 'origin/master'

    nex3 committed Nov 24, 2011
  4. Fix a weird indentation bug.

    Closes gh-424
    nex3 committed Nov 24, 2011
  5. Merge pull request #433 from infbio/form_for_pull

    Recognize haml context with form_for
    nex3 committed Nov 24, 2011
Commits on Nov 23, 2011
  1. Document to_key change.

    nex3 committed Nov 23, 2011
  2. Get rid of a TODO.

    nex3 committed Nov 23, 2011
  3. Merge remote branch 'jnv/issue_438'

    nex3 committed Nov 23, 2011
Commits on Nov 22, 2011
  1. Merge branch 'perf-fixes'

    Closes gh-346
    nex3 committed Nov 22, 2011
  2. Style tweaks to @cheald's changes.

    nex3 committed Nov 22, 2011
  3. Pass an implicit block to #compile rather than an explicit one; sligh…

    …tly improves performance
    cheald committed with nex3 Jun 18, 2011
  4. Don't create extraneous blocks. Using the exploded if seems to be a b…

    …it faster than inlining it, as well.
    cheald committed with nex3 Jun 17, 2011
  5. Use string interpolation for version memoization rather than concaten…

    …ation, as it is faster
    cheald committed with nex3 Jun 17, 2011
  6. Use defined? to test for _hamlout's existence rather than relying on …

    …exceptions to do the dirty work.
    cheald committed with nex3 Jun 17, 2011
  7. Memoize calls to version_geq so we don't check Ruby versions every ti…

    …me we call inspect_obj
    cheald committed with nex3 Feb 8, 2011
Commits on Nov 17, 2011
  1. Merge pull request #458 from caleywoods/patch-1

    RedCarpet support notation added to HAML_CHANGELOG
    nex3 committed Nov 17, 2011
Commits on Nov 15, 2011
Commits on Nov 1, 2011
  1. Merge remote branch 'origin/master'

    Conflicts:
    	doc-src/HAML_CHANGELOG.md
    nex3 committed Nov 1, 2011
  2. Merge branch 'stable'

    nex3 committed Nov 1, 2011
  3. Add a Changelog entry.

    nex3 committed Nov 1, 2011
  4. Fix signature of InstanceTag#content_tag.

    InstanceTag#content_tag should take a block to match the signature of
    ActionView::Helpers::TagHelper.
    
    Closes gh-443
    Alex Kwiatkowski, Ben Moss & Peter Jaros committed with nex3 Oct 14, 2011
Commits on Oct 19, 2011
  1. Merge pull request #445 from norman/add_kramdown_support

    Add kramdown support
    nex3 committed Oct 19, 2011