Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Mar 29, 2012
  1. @spastorino

    Bumping to 3.2.3.rc2

    spastorino authored
Commits on Mar 27, 2012
  1. @spastorino

    Bumping to 3.2.3.rc1

    spastorino authored
Commits on Mar 17, 2012
  1. @josevalim @spastorino
Commits on Mar 2, 2012
  1. @carlosantoniodasilva @drogus

    Stop SafeBuffer#clone_empty from issuing warnings

    carlosantoniodasilva authored drogus committed
    Logic in clone_empty method was dealing with old @dirty variable, which
    has changed by @html_safe in this commit:
    139963c
    
    This was issuing a "not initialized variable" warning - related to:
    #5237
    
    The logic applied by this method is already handled by the [] override,
    so there is no need to reset the variable here.
Commits on Mar 1, 2012
  1. @tenderlove

    Merge branch '3-2-2' into 3-2-stable

    tenderlove authored
    * 3-2-2:
      bumping to 3.2.2
      Ensure [] respects the status of the buffer.
      Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare
      Merge pull request #5084 from johndouthat/patch-1
      updating RAILS_VERSION
      delete vulnerable AS::SafeBuffer#[]
      use AS::SafeBuffer#clone_empty for flushing the output_buffer
      add AS::SafeBuffer#clone_empty
      fix output safety issue with select options
  2. @tenderlove

    bumping to 3.2.2

    tenderlove authored
  3. @tenderlove

    Merge branch '3-2-stable-security' into 3-2-2

    tenderlove authored
    * 3-2-stable-security:
      Ensure [] respects the status of the buffer.
      delete vulnerable AS::SafeBuffer#[]
      use AS::SafeBuffer#clone_empty for flushing the output_buffer
      add AS::SafeBuffer#clone_empty
      fix output safety issue with select options
  4. @josevalim @tenderlove

    Ensure [] respects the status of the buffer.

    josevalim authored tenderlove committed
Commits on Feb 27, 2012
  1. @tenderlove
Commits on Feb 25, 2012
  1. @RalphShnelvar

    Fixing Windows asset tag helper test failure

    RalphShnelvar authored
    In asset_tag_helper_test.rb there is an assert on the number of bytes in a
    concatenated file.  This test failed because Windows converts \n to \r\n as
    the default for "w".  This is different than in *nix systems where there is
    no conversion done.
    
    THe test that failed was test_caching_stylesheet_link_tag_when_caching_on
    
    Using bin mode fixes this behavior on windows and makes no change on the
    *nix systems.
Commits on Feb 22, 2012
  1. @tenderlove

    updating RAILS_VERSION

    tenderlove authored
Commits on Feb 21, 2012
  1. @amatsuda @tenderlove

    delete vulnerable AS::SafeBuffer#[]

    amatsuda authored tenderlove committed
  2. @amatsuda @tenderlove

    add AS::SafeBuffer#clone_empty

    amatsuda authored tenderlove committed
Commits on Feb 20, 2012
  1. @funny-falcon @tenderlove

    sync __run_callbacks with ruby-trunk

    funny-falcon authored tenderlove committed
    https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/34580
    In this revision behavior of respond_to? had changed: now to ask about
    protected method one should pass second argument `true`
Commits on Feb 18, 2012
  1. @oestrich @vijaydev

    Update Time#change docs to reflect the options it uses

    oestrich authored vijaydev committed
    [ci skip]
Commits on Feb 13, 2012
  1. @josevalim
Commits on Feb 5, 2012
  1. @kennyj
Commits on Jan 31, 2012
  1. @josevalim

    Merge pull request #4793 from kennyj/fix_4760

    josevalim authored
    [3-2-stable] Fix GH #4760. A Block was not evaluated.
  2. @marten
  3. @marten
  4. @marten

    Fix use of Deprecation without requiring active_support/deprecation i…

    marten authored
    …n ActiveSupport::Concern in Base64
  5. @marten

    Fix use of Deprecation without requiring active_support/deprecation i…

    marten authored
    …n ActiveSupport::Concern
  6. @kennyj
Commits on Jan 30, 2012
  1. @vijaydev

    fix typo [ci skip]

    vijaydev authored
Commits on Jan 27, 2012
  1. @dhh
  2. @dhh

    Revert "Fix expanding cache key for single element arrays"

    dhh authored
    This reverts commit abe915f.
    
    This broke all existing keys and it's wrong anyway. The array is just there as a convenience option for building the string. It's intentional that [ "stuff"] and "stuff" generates the same key.
Commits on Jan 26, 2012
  1. @fxn

    updating RAILS_VERSION

    fxn authored
  2. @atambo @josevalim

    safe_constantize should handle wrong constant name NameErrors Fixes #…

    atambo authored josevalim committed
    …4710
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
  3. @tenderlove
Commits on Jan 25, 2012
  1. @tenderlove

    Merge pull request #4675 from lunks/3-2-stable

    tenderlove authored
    Duping log handler on buffered logger silencer.
  2. @vijaydev

    Merge pull request #4673 from carlosantoniodasilva/validation-guides-…

    vijaydev authored
    …update-3-2
    
    Validation guides update 3 2
  3. @lunks

    Duping log handler. fixes #4668

    lunks authored
  4. @carlosantoniodasilva

    Change ActiveRecord::Errors to ActiveModel::Errors in guides

    carlosantoniodasilva authored
    Use ActiveModel::Errors in inflection example docs as well.
    
    Also fixes wrong information and link to locale file related to
    Errors#full_messages in I18n guide.
Commits on Jan 24, 2012
  1. @tenderlove

    Merge pull request #4514 from brainopia/update_timezone_offets

    tenderlove authored
    Update time zone offset information
  2. @kennyj @josevalim

    Fix GH #4344. A defined callback in extended module is called too.

    kennyj authored josevalim committed
    Conflicts:
    
    	activesupport/test/callbacks_test.rb
Something went wrong with that request. Please try again.