Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jun 12, 2011
  1. @tenderlove
  2. @tenderlove

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

    tenderlove authored
    * '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.
  3. @tenderlove

    bumping to rc4

    tenderlove authored
  4. @tenderlove

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

    tenderlove authored
    * 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
  5. @jonleighton

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

    jonleighton authored
    … location of the config.yml file for running the tests
  6. @pixeltrix
Commits on Jun 11, 2011
  1. Revert "Make sure that we don't perform in-place mutation on SafeBuff…

    Santiago Pastorino and José Ignacio Costa authored
    …er string"
    
    This reverts commit 104e200.
Commits on Jun 10, 2011
  1. @tenderlove

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

    tenderlove authored
    Render inline fix for 3-0-9
  2. @tenderlove

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

    tenderlove authored
    Render inline fix for 3-0-stable
  3. @sikachu

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

    sikachu authored
    This will make sure `render :inline` is working.
    
    Closes #1633
  4. @sikachu
  5. @pixeltrix @sikachu
  6. @sikachu

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

    sikachu authored
    This will make sure `render :inline` is working.
    
    Closes #1633
  7. @sikachu
  8. @pixeltrix
Commits on Jun 9, 2011
  1. @tenderlove
  2. @tenderlove

    bumping to 3.0.9.rc2

    tenderlove authored
  3. @tenderlove
  4. @tenderlove
  5. @sikachu @tenderlove

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

    sikachu authored tenderlove committed
    …ument is already html_safe
  6. @chopmo @tenderlove
  7. @chopmo @tenderlove
  8. @tenderlove

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

    tenderlove authored
    Make sure `escape_javascript` return `SafeBuffer` if the incoming argumen
  9. @sikachu

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

    sikachu authored
    …ument is already html_safe
Commits on Jun 8, 2011
  1. @tenderlove

    bumping to 3.0.9.rc1

    tenderlove authored
  2. @tenderlove

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

    tenderlove authored
    Add proper fix to mail_to helper
  3. @sikachu

    Add proper fix to `mail_to` helper.

    sikachu authored
    * Fix the problem on manipulating on the `ActiveSupport::SafeBuffer`
  4. @sikachu

    Revert "Fixed mailto for SafeBuffer#gsub"

    sikachu authored
    It was fixing it in a bad way by changing test.
    
    This reverts commit cdf617e.
  5. @tenderlove

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

    tenderlove authored
    Update CHANGELOG to mention the new SafeBuffer change
  6. @sikachu
  7. @josevalim

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

    josevalim authored
    Fix for issue 1553 - escape_javascript to support SafeBuffer strings
  8. @tardate

    Make escape_javascript happy to handle SafeBuffers

    tardate authored
    * see GH#1553
    * allow for the fact that gsub on SafeBuffer does not pass match variables $1, $2 etc to a block
  9. @jonleighton

    Merge pull request #1554 from rsim/assert_queries_oracle_fix_for_3_0

    jonleighton authored
    Assert queries oracle fix for 3 0
  10. @rsim

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

    rsim authored
    …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.
  11. @tenderlove

    Merge pull request #1545 from sikachu/30testbuffer

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