Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Sep 29, 2010

  1. Nathan Weizenbaum

    Merge branch 'merged'

    Conflicts:
    	Rakefile
    	doc-src/HAML_CHANGELOG.md
    	lib/sass/script/funcall.rb
    authored September 29, 2010
  2. Nathan Weizenbaum

    Merge branch 'stable' into merged

    Conflicts:
    	VERSION
    	doc-src/HAML_CHANGELOG.md
    	doc-src/SASS_CHANGELOG.md
    authored September 29, 2010
  3. Nathan Weizenbaum

    Bump VERSION to 3.0.21.

    authored September 29, 2010
  4. Nathan Weizenbaum

    Really fix the permissions errors.

    authored September 29, 2010
  5. Nathan Weizenbaum

    [Sass] Fix more #options bugs.

    Closes gh-288.
    authored September 29, 2010
  6. Nathan Weizenbaum

    Merge branch 'merged'

    authored September 29, 2010
  7. Nathan Weizenbaum

    Merge branch 'stable' into merged

    authored September 29, 2010
  8. Nathan Weizenbaum

    Don't use Shellwords.shellescape.

    It's not portable to old Rubies, and we don't really need it anyway.
    authored September 29, 2010
  9. Nathan Weizenbaum

    Merge branch 'merged'

    authored September 29, 2010
  10. Nathan Weizenbaum

    Merge branch 'stable' into merged

    authored September 29, 2010
  11. Nathan Weizenbaum

    Revert "Set options on operands during Operation#perform."

    This reverts commit 349bc86.
    
    This commit isn't the correct fix for the bug in question.
    authored September 29, 2010
  12. Nathan Weizenbaum

    Merge remote branch 'origin/stable' into stable

    authored September 29, 2010
  13. Nathan Weizenbaum

    Merge branch 'merged'

    Conflicts:
    	Rakefile
    	doc-src/HAML_CHANGELOG.md
    	extra/haml-mode.el
    	extra/sass-mode.el
    	lib/sass/script/funcall.rb
    authored September 29, 2010
  14. Nathan Weizenbaum

    Merge branch 'stable' into merged

    Conflicts:
    	VERSION
    	doc-src/HAML_CHANGELOG.md
    	doc-src/SASS_CHANGELOG.md
    authored September 29, 2010
  15. Nathan Weizenbaum

    Bump VERSION to 3.0.20.

    authored September 29, 2010
  16. Nathan Weizenbaum

    [Sass] Make sure CSS function results get #options set.

    Closes gh-286
    authored September 29, 2010
  17. Nathan Weizenbaum

    As part of packaging, fix up some permissions that can apparently go …

    …screwy.
    
    Closes gh-287
    authored September 29, 2010
  18. Chris Eppstein

    Set options on operands during Operation#perform.

    Closes GH-286.
    authored September 29, 2010
  19. Nathan Weizenbaum

    Bump VERSION to 3.0.19.

    authored September 29, 2010
  20. Nathan Weizenbaum

    Merge branch 'merged'

    Conflicts:
    	doc-src/HAML_CHANGELOG.md
    	lib/haml/engine.rb
    	lib/haml/precompiler.rb
    	test/haml/engine_test.rb
    authored September 29, 2010
  21. Nathan Weizenbaum

    Merge branch 'stable' into merged

    authored September 29, 2010
  22. Nathan Weizenbaum

    [Sass] Remove spaces after commas in `:compressed` mode.

    Closes gh-282
    authored September 28, 2010
  23. Nathan Weizenbaum

    [Haml] Fix interpolated if statements with HTML-escaping.

    authored September 28, 2010
  24. Nathan Weizenbaum

    [Haml] Fix engine_test for Ruby 1.8.

    authored September 28, 2010
  25. Nathan Weizenbaum

    [Haml] Properly dump encoded strings for the precompiled template.

    authored September 28, 2010
  26. Nathan Weizenbaum

    [Haml] Fix up a few more of the encoding assertions.

    authored September 28, 2010
  27. Nathan Weizenbaum

    [Haml] Fix an exception-swallowing bug.

    authored September 28, 2010
  28. Nathan Weizenbaum

    [Haml] Make encoding tests make a little more sense.

    authored September 28, 2010
  29. Nathan Weizenbaum

    [Haml] Fix encoding tests under Ruby 1.9.1.

    authored September 28, 2010
  30. Nathan Weizenbaum

    [Haml] Clean up the encoding tests.

    authored September 28, 2010
  31. Nathan Weizenbaum

    [Haml] Fix test_loud_ruby_multiline_with_block for 1.9.2.

    authored September 28, 2010
  32. Nathan Weizenbaum

    Revert "[Haml] Fix :encoding under 1.9.2."

    This reverts commit 1f320ab.
    
    Conflicts:
    
    	doc-src/HAML_CHANGELOG.md
    authored September 28, 2010

Sep 27, 2010

  1. Stefan Huber

    No need to use inject

    authored September 28, 2010

Sep 25, 2010

  1. Chris Eppstein

    [Sass] Proper fix for GH-275 that doesn't break other tests. Closes G…

    authored September 25, 2010

Sep 23, 2010

  1. Nathan Weizenbaum

    Merge remote branch 'origin/stable' into stable

    Conflicts:
    	doc-src/HAML_CHANGELOG.md
    	doc-src/SASS_CHANGELOG.md
    authored September 23, 2010
Something went wrong with that request. Please try again.