Permalink
Commits on Dec 7, 2010
  1. [HTML] Get rid of the Haml::HTML::Node trickery.

    Now that Hpricot only has one base class to support, we don't need to
    turn backflips to allow a mixin to be included by multiple
    superclasses.
    nex3 committed Dec 7, 2010
  2. Fix a stupid mistake.

    nex3 committed Dec 7, 2010
  3. Change the edge-gem versioning scheme.

    Rather than incrementing an index each time we push, we now impose an
    indexing based on the repo structure. The version of the prerelease
    gem is defined to be the number of commits since the stable
    branch (precisely, the number of commits in `git log stable..master
    --first-parent`). This means that when someone `rake install`s Haml
    from a Git repo, the gem is installed with the proper version number.
    nex3 committed Dec 7, 2010
  4. Merge branch 'stable'

    Conflicts:
    	doc-src/HAML_CHANGELOG.md
    	lib/sass/tree/for_node.rb
    	lib/sass/tree/if_node.rb
    	lib/sass/tree/mixin_def_node.rb
    	lib/sass/tree/mixin_node.rb
    	lib/sass/tree/node.rb
    	lib/sass/tree/root_node.rb
    	lib/sass/tree/rule_node.rb
    	lib/sass/tree/while_node.rb
    	test/sass/engine_test.rb
    nex3 committed Dec 7, 2010
  5. [Haml] [HTML] Work even if Hpricot is loaded first.

    Closes gh-324
    Closes gh-322
    nex3 committed Dec 7, 2010
Commits on Nov 29, 2010
  1. DRY up some invalid_child stuff.

    nex3 committed Nov 29, 2010
Commits on Nov 26, 2010
  1. Update vendor/sass

    nex3 committed Nov 26, 2010
Commits on Nov 23, 2010
  1. Merge branch 'stable'

    Conflicts:
    	doc-src/SASS_CHANGELOG.md
    	lib/sass/script/lexer.rb
    	test/sass/scss/scss_test.rb
    nex3 committed Nov 23, 2010
Commits on Nov 19, 2010
  1. Merge branch 'merged'

    Conflicts:
    	doc-src/SASS_CHANGELOG.md
    	lib/sass/engine.rb
    	lib/sass/tree/root_node.rb
    nex3 committed Nov 19, 2010
  2. Merge remote branch 'haml/merged' into merged

    Conflicts:
    	doc-src/SASS_CHANGELOG.md
    nex3 committed Nov 19, 2010
  3. Merge branch 'stable' into merged

    Conflicts:
    	VERSION
    	doc-src/HAML_CHANGELOG.md
    	doc-src/SASS_CHANGELOG.md
    nex3 committed Nov 19, 2010
  4. Merge remote branch 'haml/stable' into stable

    Conflicts:
    	doc-src/SASS_CHANGELOG.md
    nex3 committed Nov 19, 2010
Commits on Nov 17, 2010
Commits on Nov 16, 2010
  1. Merge branch 'merged'

    Conflicts:
    	doc-src/SASS_CHANGELOG.md
    	lib/haml/exec.rb
    	lib/sass/scss/parser.rb
    	test/sass/scss/scss_test.rb
    nex3 committed Nov 16, 2010
  2. Merge branch 'stable' into merged

    Conflicts:
    	VERSION
    	doc-src/HAML_CHANGELOG.md
    	doc-src/SASS_CHANGELOG.md
    nex3 committed Nov 16, 2010
  3. Bump VERSION to 3.0.24.

    nex3 committed Nov 16, 2010
Commits on Nov 9, 2010
Commits on Oct 31, 2010
  1. Merge branch 'stable' into merged

    nex3 committed Oct 31, 2010
  2. Merge branch 'merged'

    Conflicts:
    	doc-src/SASS_CHANGELOG.md
    	lib/sass/plugin.rb
    	lib/sass/plugin/compiler.rb
    nex3 committed Oct 31, 2010
  3. Merge branch 'stable' into merged

    Conflicts:
    	VERSION
    	doc-src/HAML_CHANGELOG.md
    	doc-src/SASS_CHANGELOG.md
    nex3 committed Oct 31, 2010