Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Jun 12, 2011

  1. Aaron Patterson

    Preparing for 3.0.9.rc5 release

    authored June 12, 2011
  2. Aaron Patterson

    Merge branch '3-0-9' of github.com:rails/rails into 3-0-9

    * '3-0-9' of github.com:rails/rails:
      Make sure that we don't perform in-place mutation on SafeBuffer string
      Update CHANGELOG to mention the json_escape change
      Ensure number helpers can handle HTML safe strings - closes #1597.
    authored June 12, 2011
  3. Aaron Patterson

    bumping to rc4

    authored June 12, 2011
  4. Aaron Patterson

    Merge branch '3-0-stable' into 3-0-9

    * 3-0-stable:
      Add support for using an ARCONFIG environment variable to specify the location of the config.yml file for running the tests
      Define ActiveSupport#to_param as to_str - closes #1663
      Revert "Make sure that we don't perform in-place mutation on SafeBuffer string"
      Make sure that we don't perform in-place mutation on SafeBuffer string
      Update CHANGELOG to mention the json_escape change
      Ensure number helpers can handle HTML safe strings - closes #1597.
      ensuring that json_escape returns html safe strings when passed an html safe string
      Fix issue #1598 by adding a dependency to the RDoc gem.
      Make sure `escape_javascript` return `SafeBuffer` if the incoming argument is already html_safe
    
    Conflicts:
    	actionpack/CHANGELOG
    authored June 12, 2011
  5. Jon Leighton

    Add support for using an ARCONFIG environment variable to specify the…

    … location of the config.yml file for running the tests
    authored June 12, 2011
  6. Andrew White

    Define ActiveSupport#to_param as to_str - closes #1663

    authored June 12, 2011

Jun 11, 2011

  1. Revert "Make sure that we don't perform in-place mutation on SafeBuff…

    …er string"
    
    This reverts commit 104e200.
    authored June 10, 2011

Jun 10, 2011

  1. Aaron Patterson

    Merge pull request #1640 from sikachu/3-0-9-render-inline

    Render inline fix for 3-0-9
    authored June 10, 2011
  2. Aaron Patterson

    Merge pull request #1639 from sikachu/3-0-stable-render-inline

    Render inline fix for 3-0-stable
    authored June 10, 2011
  3. Prem Sichanugrist

    Make sure that we don't perform in-place mutation on SafeBuffer string

    This will make sure `render :inline` is working.
    
    Closes #1633
    authored June 10, 2011
  4. Prem Sichanugrist

    Update CHANGELOG to mention the json_escape change

    authored June 10, 2011
  5. Andrew White

    Ensure number helpers can handle HTML safe strings - closes #1597.

    authored June 10, 2011 sikachu committed June 10, 2011
  6. Prem Sichanugrist

    Make sure that we don't perform in-place mutation on SafeBuffer string

    This will make sure `render :inline` is working.
    
    Closes #1633
    authored June 10, 2011
  7. Prem Sichanugrist

    Update CHANGELOG to mention the json_escape change

    authored June 10, 2011
  8. Andrew White

    Ensure number helpers can handle HTML safe strings - closes #1597.

    authored June 10, 2011

Jun 09, 2011

  1. Aaron Patterson

    bumping to rc3 since syck is not playing nicely

    authored June 09, 2011
  2. Aaron Patterson

    bumping to 3.0.9.rc2

    authored June 09, 2011
  3. Aaron Patterson

    ensuring that json_escape returns html safe strings when passed an ht…

    …ml safe string
    authored June 09, 2011
  4. Aaron Patterson

    ensuring that json_escape returns html safe strings when passed an ht…

    …ml safe string
    authored June 09, 2011
  5. Prem Sichanugrist

    Make sure `escape_javascript` return `SafeBuffer` if the incoming arg…

    …ument is already html_safe
    authored June 09, 2011 tenderlove committed June 09, 2011
  6. Jacob Tjoernholm

    Fix issue #1598 by adding a dependency to the RDoc gem.

    authored June 09, 2011 tenderlove committed June 09, 2011
  7. Jacob Tjoernholm

    Fix issue #1598 by adding a dependency to the RDoc gem.

    authored June 09, 2011 tenderlove committed June 09, 2011
  8. Aaron Patterson

    Merge pull request #1611 from sikachu/3-0-stable-javascript

    Make sure `escape_javascript` return `SafeBuffer` if the incoming argumen
    authored June 09, 2011
  9. Prem Sichanugrist

    Make sure `escape_javascript` return `SafeBuffer` if the incoming arg…

    …ument is already html_safe
    authored June 09, 2011

Jun 08, 2011

  1. Aaron Patterson

    bumping to 3.0.9.rc1

    authored June 08, 2011
  2. Aaron Patterson

    Merge pull request #1568 from sikachu/3-0-stable-mailto

    Add proper fix to mail_to helper
    authored June 08, 2011
  3. Prem Sichanugrist

    Add proper fix to `mail_to` helper.

    * Fix the problem on manipulating on the `ActiveSupport::SafeBuffer`
    authored June 08, 2011
  4. Prem Sichanugrist

    Revert "Fixed mailto for SafeBuffer#gsub"

    It was fixing it in a bad way by changing test.
    
    This reverts commit cdf617e.
    authored June 08, 2011
  5. Aaron Patterson

    Merge pull request #1565 from sikachu/3-0-stable-changelog

    Update CHANGELOG to mention the new SafeBuffer change
    authored June 08, 2011
  6. Prem Sichanugrist

    Update CHANGELOG to mention the new SafeBuffer change

    authored June 08, 2011
  7. José Valim

    Merge pull request #1558 from tardate/3-0-stable

    Fix for issue 1553 - escape_javascript to support SafeBuffer strings
    authored June 08, 2011
  8. Paul Gallagher

    Make escape_javascript happy to handle SafeBuffers

    * see GH#1553
    * allow for the fact that gsub on SafeBuffer does not pass match variables $1, $2 etc to a block
    authored June 08, 2011
  9. Jon Leighton

    Merge pull request #1554 from rsim/assert_queries_oracle_fix_for_3_0

    Assert queries oracle fix for 3 0
    authored June 08, 2011
  10. Raimonds Simanovskis

    Fix for Oracle adapter to count SELECT queries for assert_queries ass…

    …ertion
    
    Needed just in 3-0-stable branch, query counting is refactored in 3-1-stable and master branches and do not need this patch anymore.
    authored June 08, 2011
  11. Aaron Patterson

    Merge pull request #1545 from sikachu/30testbuffer

    Fix test on 3-0-stable regarding SafeBuffer
    authored June 07, 2011
Something went wrong with that request. Please try again.