Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Dec 7, 2010
  1. @nex3
  2. @nex3

    [HTML] Get rid of the Haml::HTML::Node trickery.

    nex3 authored
    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.
  3. @nex3
  4. @nex3

    Fix a stupid mistake.

    nex3 authored
  5. @nex3

    Change the edge-gem versioning scheme.

    nex3 authored
    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.
  6. @kevmoo
  7. @nex3

    Merge branch 'stable'

    nex3 authored
    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
  8. @nex3
Commits on Nov 29, 2010
  1. @nex3

    DRY up some invalid_child stuff.

    nex3 authored
  2. @nex3
Commits on Nov 26, 2010
  1. @nex3

    Update vendor/sass

    nex3 authored
Commits on Nov 23, 2010
  1. @nex3

    Merge branch 'stable'

    nex3 authored
    Conflicts:
    	doc-src/SASS_CHANGELOG.md
    	lib/sass/script/lexer.rb
    	test/sass/scss/scss_test.rb
  2. @nex3
Commits on Nov 19, 2010
  1. @nex3

    Merge branch 'merged'

    nex3 authored
    Conflicts:
    	doc-src/SASS_CHANGELOG.md
    	lib/sass/engine.rb
    	lib/sass/tree/root_node.rb
  2. @nex3

    Merge remote branch 'haml/merged' into merged

    nex3 authored
    Conflicts:
    	doc-src/SASS_CHANGELOG.md
  3. @nex3

    Merge branch 'stable' into merged

    nex3 authored
    Conflicts:
    	VERSION
    	doc-src/HAML_CHANGELOG.md
    	doc-src/SASS_CHANGELOG.md
  4. @nex3
  5. @nex3

    Merge remote branch 'haml/stable' into stable

    nex3 authored
    Conflicts:
    	doc-src/SASS_CHANGELOG.md
  6. @nex3
Commits on Nov 17, 2010
  1. @nex3
Commits on Nov 16, 2010
  1. @nex3

    Merge branch 'merged'

    nex3 authored
    Conflicts:
    	doc-src/SASS_CHANGELOG.md
    	lib/haml/exec.rb
    	lib/sass/scss/parser.rb
    	test/sass/scss/scss_test.rb
  2. @nex3

    Merge branch 'stable' into merged

    nex3 authored
    Conflicts:
    	VERSION
    	doc-src/HAML_CHANGELOG.md
    	doc-src/SASS_CHANGELOG.md
  3. @nex3
  4. @nex3

    Bump VERSION to 3.0.24.

    nex3 authored
  5. @nex3
  6. @nex3
  7. @nex3
  8. @nex3
Commits on Nov 9, 2010
  1. @nex3
  2. @nex3
Commits on Oct 31, 2010
  1. @nex3

    Merge branch 'stable' into merged

    nex3 authored
  2. @nex3
  3. @nex3
  4. @nex3

    Merge branch 'merged'

    nex3 authored
    Conflicts:
    	doc-src/SASS_CHANGELOG.md
    	lib/sass/plugin.rb
    	lib/sass/plugin/compiler.rb
  5. @nex3

    Merge branch 'stable' into merged

    nex3 authored
    Conflicts:
    	VERSION
    	doc-src/HAML_CHANGELOG.md
    	doc-src/SASS_CHANGELOG.md
Something went wrong with that request. Please try again.