Skip to content
Commits on Jul 10, 2011
  1. @hcatlin

    Merge pull request #413 from masterkain/master

    Fix typo in gemspec.
    hcatlin committed Jul 10, 2011
  2. @masterkain

    Fix typo in gemspec

    masterkain committed Jul 10, 2011
  3. @hcatlin

    RJS has been removed from Rails in 3.1+. Before

    running this test, make sure that the PrototypeHelper
    class is defined. This should work well as a test.
    
    If we want to make sure this is tested, there is a
    prototype-rails gem that can be required beforehand.
    hcatlin committed Jul 10, 2011
  4. @hcatlin

    The gemspec didn't specify two needed development gems.

    Both of these are required to run the tests during
    development. Since there isn't a Gemfile for this
    project and I can't find where the development
    requirements are, I am assuming this is the right place 
    to put this.
    hcatlin committed Jul 10, 2011
Commits on Jun 8, 2011
  1. @nex3

    Merge pull request #398 from brainopia/master

    Compatibility with rails head
    nex3 committed Jun 7, 2011
  2. @nex3

    Merge branch 'stable'

    nex3 committed Jun 7, 2011
  3. @nex3
  4. @nex3

    Don't destructively modify SafeBuffers.

    Closes gh-399
    Closes gh-400
    nex3 committed Jun 7, 2011
Commits on May 31, 2011
  1. @brainopia
  2. @brainopia
Commits on May 20, 2011
  1. @nex3

    Fix html2haml.

    nex3 committed May 20, 2011
Commits on May 10, 2011
  1. @nex3

    Merge branch 'stable'

    nex3 committed May 10, 2011
  2. @nex3
  3. @nex3
Commits on Apr 25, 2011
  1. @nex3

    Merge branch 'stable'

    Conflicts:
    	VERSION
    nex3 committed Apr 25, 2011
  2. @nex3

    Update VERSION and VERSION_NAME.

    nex3 committed Apr 25, 2011
  3. @nex3

    Bump VERSION to 3.1.1.

    nex3 committed Apr 25, 2011
  4. @nex3

    Fix up the changelog.

    nex3 committed Apr 25, 2011
  5. @nex3

    Update vendor/sass to 3.1.0.

    nex3 committed Apr 25, 2011
Commits on Apr 24, 2011
  1. @nex3

    Bump VERSION to 3.1.0.

    nex3 committed Apr 24, 2011
Commits on Dec 29, 2010
  1. @nex3

    Merge branch 'stable'

    Conflicts:
    	doc-src/HAML_CHANGELOG.md
    nex3 committed Dec 29, 2010
  2. @nex3

    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. @nex3

    Merge branch 'stable'

    Conflicts:
    	doc-src/SASS_CHANGELOG.md
    	vendor/fssm
    nex3 committed Dec 18, 2010
  2. @nex3

    Update FSSM to version 0.2.3.

    nex3 committed Dec 18, 2010
Commits on Dec 17, 2010
  1. @nex3

    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. @nex3

    Merge remote branch 'origin/stable' into stable

    Conflicts:
    	doc-src/SASS_CHANGELOG.md
    nex3 committed Dec 17, 2010
  3. @nex3

    Bump VERSION to 3.0.25.

    nex3 committed Dec 17, 2010
Commits on Dec 16, 2010
  1. @nex3

    [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. @nex3

    Merge remote branch 'refs/remotes/origin/stable' into stable

    Conflicts:
    	doc-src/SASS_CHANGELOG.md
    nex3 committed Dec 8, 2010
  2. @nex3

    [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. @nex3
  2. @nex3

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

    Fix a stupid mistake.

    nex3 committed Dec 7, 2010
  5. @nex3

    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
Something went wrong with that request. Please try again.