Permalink
Commits on Jun 12, 2011
  1. bumping to rc4

    tenderlove committed Jun 12, 2011
  2. Merge branch '3-0-stable' into 3-0-9

    tenderlove committed Jun 12, 2011
    * 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
  3. Add support for using an ARCONFIG environment variable to specify the…

    jonleighton committed Jun 12, 2011
    … location of the config.yml file for running the tests
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
    Santiago Pastorino and José Ignacio Costa committed Jun 11, 2011
    …er string"
    
    This reverts commit 104e200.
Commits on Jun 10, 2011
  1. Merge pull request #1639 from sikachu/3-0-stable-render-inline

    tenderlove committed Jun 10, 2011
    Render inline fix for 3-0-stable
  2. Make sure that we don't perform in-place mutation on SafeBuffer string

    sikachu committed Jun 10, 2011
    This will make sure `render :inline` is working.
    
    Closes #1633
Commits on Jun 9, 2011
  1. bumping to 3.0.9.rc2

    tenderlove committed Jun 9, 2011
  2. Make sure `escape_javascript` return `SafeBuffer` if the incoming arg…

    sikachu authored and tenderlove committed Jun 9, 2011
    …ument is already html_safe
  3. Merge pull request #1611 from sikachu/3-0-stable-javascript

    tenderlove committed Jun 9, 2011
    Make sure `escape_javascript` return `SafeBuffer` if the incoming argumen
  4. Make sure `escape_javascript` return `SafeBuffer` if the incoming arg…

    sikachu committed Jun 9, 2011
    …ument is already html_safe
Commits on Jun 8, 2011
  1. bumping to 3.0.9.rc1

    tenderlove committed Jun 8, 2011
  2. Merge pull request #1568 from sikachu/3-0-stable-mailto

    tenderlove committed Jun 8, 2011
    Add proper fix to mail_to helper
  3. Add proper fix to `mail_to` helper.

    sikachu committed Jun 8, 2011
    * Fix the problem on manipulating on the `ActiveSupport::SafeBuffer`
  4. Revert "Fixed mailto for SafeBuffer#gsub"

    sikachu committed Jun 8, 2011
    It was fixing it in a bad way by changing test.
    
    This reverts commit cdf617e.
  5. Merge pull request #1565 from sikachu/3-0-stable-changelog

    tenderlove committed Jun 8, 2011
    Update CHANGELOG to mention the new SafeBuffer change
  6. Merge pull request #1558 from tardate/3-0-stable

    josevalim committed Jun 8, 2011
    Fix for issue 1553 - escape_javascript to support SafeBuffer strings
  7. Make escape_javascript happy to handle SafeBuffers

    tardate committed Jun 8, 2011
    * see GH#1553
    * allow for the fact that gsub on SafeBuffer does not pass match variables $1, $2 etc to a block
  8. Merge pull request #1554 from rsim/assert_queries_oracle_fix_for_3_0

    jonleighton committed Jun 8, 2011
    Assert queries oracle fix for 3 0
  9. Fix for Oracle adapter to count SELECT queries for assert_queries ass…

    rsim committed Jun 8, 2011
    …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.
  10. Merge pull request #1545 from sikachu/30testbuffer

    tenderlove committed Jun 8, 2011
    Fix test on 3-0-stable regarding SafeBuffer
  11. Adapt [059692a] to make sure we perform correct cloning before manipu…

    sikachu committed Jun 8, 2011
    …lation on `OutputBuffer`.
    
    This has been adapted from [823aa22]. However, after the fragment rendering, `Builder` returns the `String` object instead of `ActionView::OutputBuffer`. Somehow the same procedure which was in [823aa22] does not play nice with the String, and result in the fragment got lost.
  12. Merge pull request #1541 from arunagw/3-0-stable

    tenderlove committed Jun 8, 2011
    Fixed for SafeBuffer
Commits on Jun 7, 2011
  1. Merge branch '3-0-8' into 3-0-stable

    tenderlove committed Jun 7, 2011
    * 3-0-8:
      bumping to 3.0.8
      Do not modify a safe buffer in helpers
      Ensure that the strings returned by SafeBuffer#gsub and friends aren't considered html_safe?
  2. bumping to 3.0.8

    tenderlove committed Jun 7, 2011