Permalink
Commits on Oct 19, 2011
  1. Merge pull request #445 from norman/add_kramdown_support

    Add kramdown support
    nex3 committed Oct 19, 2011
  2. Begin changelog entry for 3.2.0.

    norman committed Oct 19, 2011
  3. Add support for Kramdown

    norman committed Oct 19, 2011
Commits on Oct 14, 2011
  1. Revert "Merge pull request #441 from Casecommons/stable"

    This reverts commit 135f291, reversing
    changes made to 84450bb.
    
    This commit broke the build.
    nex3 committed Oct 14, 2011
  2. Merge pull request #441 from Casecommons/stable

    Fix signature of InstanceTag#content_tag.
    nex3 committed Oct 14, 2011
Commits on Oct 13, 2011
  1. Added regression test for InstanceTag#content_tag so that it can take…

    … a block
    Alex Kwiatkowski, Ben Moss & Peter Jaros committed Oct 13, 2011
  2. Fix signature of InstanceTag#content_tag.

    InstanceTag#content_tag should take a block to match the signature of
    ActionView::Helpers::TagHelper.
    Alex Kwiatkowski & Peter Jaros committed with Alex Kwiatkowski, Ben Moss & Peter Jaros Sep 15, 2011
Commits on Sep 27, 2011
  1. Merge branch 'stable'

    nex3 committed Sep 27, 2011
  2. Revert "Update reference to ActionView::Template::Handler since it wa…

    …s removed from rails"
    
    This reverts commit 41be859.
    
    This and the previous reverted commit broke compatibility with old Rails
    versions, and didn't seem to fix anything anyway (stable, for instance, was
    working just fine on new Rails versions).
    
    What's more, Rails compatibility changes belong in stable.
    nex3 committed Sep 27, 2011
  3. Revert "Fix Haml::Utils.av_template_class for latest rails"

    This reverts commit 712e609.
    nex3 committed Sep 27, 2011
  4. Merge branch 'stable'

    nex3 committed Sep 27, 2011
  5. Actually fix .travis.yml.

    nex3 committed Sep 27, 2011
Commits on Sep 26, 2011
  1. Try a different hash syntax in .travis.yml.

    Hopefully this will make the exclusion rules work.
    nex3 committed Sep 26, 2011
Commits on Sep 22, 2011
  1. Download submodules before testing.

    This doesn't matter for the Sass submodule, but we would like to run the
    haml-spec tests.
    nex3 committed Sep 22, 2011
  2. Include Sass in the Gemfiles.

    This is cleaner and more future-proof than forcing people to check out the
    vendored Sass.
    nex3 committed Sep 22, 2011
  3. Merge branch 'stable'

    nex3 committed Sep 22, 2011
  4. Add a config file for Travis CI.

    nex3 committed Sep 22, 2011
  5. Update the test:rails_compatibility infrastructure.

    This moves to a Bundler-based infrastructure where each Rails version has its
    own Gemfile. This has the benefit of being compatible with Travis CI as well.
    nex3 committed Sep 22, 2011
Commits on Sep 20, 2011
  1. Merge branch 'stable'

    Conflicts:
    	test/haml/template_test.rb
    nex3 committed Sep 20, 2011
Commits on Sep 13, 2011
  1. Fix link in HAML_REFERENCE.md.

    Use yard "object" link rather than "file" link so that link to Helpers
    module works.
    mattwildig committed with nex3 Sep 10, 2011
Commits on Sep 10, 2011
  1. Merge pull request #429 from mattwildig/docs-link

    Fix link in HAML_REFERENCE.md to a non-existent Helpers.html file
    hcatlin committed Sep 10, 2011
  2. Fix link in HAML_REFERENCE.md.

    Use yard "object" link rather than "file" link so that link to Helpers
    module works.
    mattwildig committed Sep 10, 2011
Commits on Sep 9, 2011
  1. Merge branch 'stable'

    Conflicts:
    	VERSION
    nex3 committed Sep 9, 2011
  2. Bump version to 3.1.3.

    nex3 committed Sep 9, 2011
  3. Fix partial layouts.

    Closes gh-403
    Closes gh-412
    Closes gh-417
    nex3 committed Sep 9, 2011
Commits on Jul 10, 2011
  1. Merge pull request #413 from masterkain/master

    Fix typo in gemspec.
    hcatlin committed Jul 10, 2011