Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Aug 16, 2011
  1. @tenderlove

    bumping rails to 3.0.10

    tenderlove authored
  2. @tenderlove

    Tags with invalid names should also be stripped in order to prevent

    tenderlove authored
    XSS attacks.  Thanks Sascha Depold for the report.
  3. @tenderlove
Commits on Aug 5, 2011
  1. @tenderlove

    bumping to 3.0.10.rc1

    tenderlove authored
Commits on Jul 24, 2011
  1. @spastorino

    Merge pull request #2080 from lhahne/3-0-stable

    spastorino authored
    Fix improper detection and handling of html_safe buffer in CacheHelper
Commits on Jul 18, 2011
  1. @jstorimer

    Ensure that status codes are logged properly

    jstorimer authored
    Needed to move AC::Metal::Instrumentation before AM::Metal::Rescue
    so that status codes rendered from rescue_from blocks are logged
    properly.
Commits on Jul 17, 2011
  1. @lhahne

    made sure that the possible new output_buffer created by CacheHelper …

    lhahne authored
    …is of the same type as the original
Commits on Jul 15, 2011
  1. @lhahne
Commits on Jul 1, 2011
  1. @bogdan @pixeltrix

    Fixed ActionView::FormOptionsHelper#select with :multiple => false

    bogdan authored pixeltrix committed
    (cherry picked from commit 0fdac01)
    
    Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
Commits on Jun 29, 2011
  1. @guilleiguaran
Commits on Jun 23, 2011
  1. Fixes an issue where cache sweepers with only after filters would hav…

    Jeroen Jacobs authored
    …e no controller object
    
    It would raise undefined method controller_name for nil
Commits on Jun 16, 2011
  1. @tenderlove

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

    tenderlove authored
    * 3-0-9:
      Preparing for 3.0.9 release
      avoid false positives caused by release candidates
      Preparing for 3.0.9.rc5 release
      bumping to rc4
      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.
      bumping to rc3 since syck is not playing nicely
      bumping to 3.0.9.rc2
      ensuring that json_escape returns html safe strings when passed an html safe string
      Make sure `escape_javascript` return `SafeBuffer` if the incoming argument is already html_safe
      Fix issue #1598 by adding a dependency to the RDoc gem.
      bumping to 3.0.9.rc1
  2. @tenderlove

    Preparing for 3.0.9 release

    tenderlove authored
Commits on Jun 15, 2011
  1. @dmathieu
  2. @dmathieu
  3. @dmathieu @pixeltrix

    simplify to only one condition

    dmathieu authored pixeltrix committed
    Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
  4. @pixeltrix
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
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. @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
  2. @pixeltrix @sikachu
  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. @pixeltrix
Commits on Jun 9, 2011
  1. @tenderlove
  2. @tenderlove

    bumping to 3.0.9.rc2

    tenderlove authored
  3. @sikachu @tenderlove

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

    sikachu authored tenderlove committed
    …ument is already html_safe
  4. @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. @sikachu

    Add proper fix to `mail_to` helper.

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

    Revert "Fixed mailto for SafeBuffer#gsub"

    sikachu authored
    It was fixing it in a bad way by changing test.
    
    This reverts commit cdf617e.
  4. @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
  5. @sikachu

    Adapt [059692a] to make sure we perform correct cloning before manipu…

    sikachu authored
    …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.
Something went wrong with that request. Please try again.