Permalink
Commits on May 10, 2011
  1. Merge branch 'stable'

    nex3 committed May 10, 2011
Commits on Apr 25, 2011
  1. Merge branch 'stable'

    Conflicts:
    	VERSION
    nex3 committed Apr 25, 2011
  2. Update VERSION and VERSION_NAME.

    nex3 committed Apr 25, 2011
  3. Bump VERSION to 3.1.1.

    nex3 committed Apr 25, 2011
  4. Fix up the changelog.

    nex3 committed Apr 25, 2011
  5. Update vendor/sass to 3.1.0.

    nex3 committed Apr 25, 2011
Commits on Apr 24, 2011
  1. Bump VERSION to 3.1.0.

    nex3 committed Apr 24, 2011
Commits on Dec 29, 2010
  1. Merge branch 'stable'

    Conflicts:
    	doc-src/HAML_CHANGELOG.md
    nex3 committed Dec 29, 2010
  2. Require Ruby files before parsing Haml.

    This allows custom filters to be loaded from the command line.
    nex3 committed Dec 29, 2010
Commits on Dec 19, 2010
  1. Merge branch 'stable'

    Conflicts:
    	doc-src/SASS_CHANGELOG.md
    	vendor/fssm
    nex3 committed Dec 19, 2010
  2. Update FSSM to version 0.2.3.

    nex3 committed Dec 19, 2010
Commits on Dec 17, 2010
  1. Merge branch 'stable'

    Conflicts:
    	VERSION
    	doc-src/HAML_CHANGELOG.md
    	doc-src/SASS_CHANGELOG.md
    	lib/sass/plugin.rb
    	lib/sass/scss/parser.rb
    nex3 committed Dec 17, 2010
  2. Merge remote branch 'origin/stable' into stable

    Conflicts:
    	doc-src/SASS_CHANGELOG.md
    nex3 committed Dec 17, 2010
  3. Bump VERSION to 3.0.25.

    nex3 committed Dec 17, 2010
Commits on Dec 16, 2010
  1. [Sass] Fix sass --update file1:file2.

    file1 was being recompiled even when file2 was newer.
    nex3 committed Dec 16, 2010
Commits on Dec 8, 2010
  1. Merge remote branch 'refs/remotes/origin/stable' into stable

    Conflicts:
    	doc-src/SASS_CHANGELOG.md
    nex3 committed Dec 8, 2010
  2. [Sass] Fix a performance bug.

    Backtracking in the SCSS parser when deciding between a declaration or a ruleset
    was taking way too long. When an expected token wasn't found, the parser
    constructed the full exception, which involved parsing the template for the
    error message. This parsing was O(template size), leading to nesting-heavy
    templates approaching O((template size)^2).
    
    The new approach makes backtracking more light-weight, at the cost of making
    exception-raising even more expensive (a perfectly acceptable tradeoff). When
    backtracking is being considered, no exception is raised; instead, Kernel#throw
    is used. Since the full error object is unavailable, once the parser knows which
    error it wants to raise, it actually moves backwards and re-runs the production
    that caused the error in order to re-raise the error.
    
    Closes gh-327
    nex3 committed Dec 8, 2010
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