Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Feb 28, 2015
  1. Akira Matsuda

    Is this what you mean?

    amatsuda authored
    [ci skip]
Commits on Feb 4, 2015
  1. Matt Wildig

    Fix typo in doc comments

    mattwildig authored
Commits on Feb 1, 2015
  1. Matt Wildig

    Only use parsed value when checking Ruby multiline

    mattwildig authored
    When checking whether a line is Ruby multiline use the parse value
    rather than the whole line, which may include extraneous trailing
    whitespace.
    
    Fixes #830
Commits on Jan 8, 2015
  1. Tee Parham

    Test rails 4.2

    teeparham authored
  2. Tee Parham

    Update travis

    teeparham authored
    * Add ruby 2.2
    * Use latest ruby 2.1
Commits on Dec 24, 2014
  1. Norman Clarke

    Merge pull request #821 from braingourmets/task/travis-performance

    norman authored
    [TASK] Configure Travis for better build performance
  2. Oliver Klee

    [TASK] Configure Travis for better build performance

    oliverklee authored
    * set sudo: false so Travis can use their new container-based infrastructure
    * enable bundler caching
    * set language: ruby for good measure
Commits on Dec 18, 2014
  1. Norman Clarke

    Merge pull request #786 from etagwerker/improve_method_doc_util_html_…

    norman authored
    …safe
    
    Added a note about ActiveSupport to the #html_safe method.
  2. Norman Clarke

    Merge pull request #817 from haml/rake_doc

    norman authored
    Cleanup Rakefile doc tasks
Commits on Dec 1, 2014
  1. Tee Parham

    Cleanup Rakefile doc tasks

    teeparham authored
    * Remove `require ‘yard’`. The Gemfile requires yard.
    * Remove unnecessary begin/rescue block around doc tasks.
    * Remove Rakefile#silence_warnings.
  2. Norman Clarke
  3. Tee Parham

    Use #silence_warnings from test_helper

    teeparham authored
    `Kernel.silence_warnings` is an ActiveSupport patch
  4. Tee Parham
  5. Norman Clarke
  6. Norman Clarke

    Test against Rails 4.2.rc1

    norman authored
  7. Norman Clarke
  8. Norman Clarke

    Merge branch 'stable'

    norman authored
    Conflicts:
    	lib/haml/helpers/action_view_extensions.rb
    	test/helper_test.rb
    	test/test_helper.rb
  9. Norman Clarke
Commits on Nov 29, 2014
  1. Matt Wildig
  2. Matt Wildig

    Only check script lines for continuation keywords

    mattwildig authored
    If a non-script line starts with a keyword it can cause errors.
  3. Matt Wildig

    Replace original ERB filter options after test

    mattwildig authored
    This is just a precaution, it isn't causing any issues at the moment.
  4. Matt Wildig

    Use variable not constant for Erb test

    mattwildig authored
    Using uppercase name creates a constant, which can cause warnings as it
    is redefined.
Commits on Nov 28, 2014
  1. Matt Wildig

    Make dynamic test names start with test_

    mattwildig authored
    Minitest checks for methods names starting with "test_", not just
    "test" (i.e. there is an underscore). This appears to be a change a in
    recent version.
Commits on Nov 27, 2014
  1. Matt Wildig

    Use https in URLs for Github links

    mattwildig authored
    Avoid unnecessary redirects.
Commits on Nov 26, 2014
  1. Matt Wildig

    Use Bundler.with_clean_env

    mattwildig authored
    Use Bundler.with_clean_env for cleaner behaviour when performing actions
    for different test Gemfiles, mainly installing dependencies.
    
    Previously, running e.g. `bundle exec rake test:rc` could resuly in
    errors as the parent Bundler environment was fully removed.
  2. Matt Wildig
Commits on Nov 25, 2014
  1. Tee Parham

    Merge pull request #813 from eljojo/patch-1

    teeparham authored
    Fix typo in Haml::Engine documentation [ci skip]
  2. José Tomás Albornoz
Commits on Nov 19, 2014
  1. Matt Wildig

    Fix for haml_tag and haml_concat and XSS

    mattwildig authored
    Before this commit, haml_tag relied on haml_concat to write its output.
    This created a problem when XSS protection was in use - the tags
    themselves needed not to be escaped, but the tags contents should be
    escaped. The current workaround used the with_raw_haml_concat method to
    set a flag to control whether haml_concat should be escaped, but this is
    too crude and results in any use of haml_concat inside a block passed to
    haml_tag not being escaped when it should.
    
    Create new private methods in Helpers to allow more control of writing
    to the buffer, and change haml_tag to use them so that haml_tag and
    haml_concat behave correctly when XSS protection is in use.
    
    Also alter haml_concat_with_haml_xss so it still respects
    with_raw_haml_concat.
    
    See #718, #731, #732
  2. Matt Wildig

    Add and fix tests for haml_concat inside haml_tag

    mattwildig authored
    Contents written with haml_concat inside a block passed to haml_tag
    should still be escaped if XSS protection is active.
    
    Change existing test and add a new one that makes this cleaer.
  3. Matt Wildig
  4. Matt Wildig

    Fix interpolated comments breaking tabulation

    mattwildig authored
    When interpolating single line comments, use the nuke_inner_whitespace
    option to prevent format_script from decrementing the @real_tabs
    variable in the buffer, which can result in issues later in the Haml.
    
    This is admittedly a bit of a hack, cased by the number of params for
    format_script and the number of routes through that method. Other parts
    of the compiler explicitly emit code to add the extra tab to take this
    into account, which is arguably worse.
Commits on Nov 12, 2014
  1. Tee Parham

    Fix indentation [ci skip]

    teeparham authored
Commits on Oct 31, 2014
  1. Tee Parham

    Add rails 4.2 to test matrix

    teeparham authored
  2. Tee Parham

    Test ruby 2.1.4

    teeparham authored
Something went wrong with that request. Please try again.