Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Mar 6, 2013
  1. @tenderlove

    bumping to rc2

    tenderlove authored
Commits on Feb 27, 2013
  1. @steveklabnik
Commits on Feb 25, 2013
  1. @mikeycgto
Commits on Feb 24, 2013
  1. @hsbt @sikachu

    added marshal_load and marshal_dump for ProxyTestResult. Behavior of …

    hsbt authored sikachu committed
    …method_missing with Marshal.dump and Marshal.load is changing in ruby 2.0.0 later.
  2. @tenderlove @sikachu

    search private and protected methods for convert_key

    tenderlove authored sikachu committed
  3. @sikachu

    Add in missing requires

    sikachu authored
Commits on Feb 11, 2013
  1. @tenderlove

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

    tenderlove authored
    * 3-2-sec:
      bumping version
      remove ruby-prof
      Fix issue with attr_protected where malformed input could circumvent protection
      fixing call to columns hash. run the damn tests when you backport!
      Bump rack dependency to 1.4.5
      Merge pull request #9224 from dylanahsmith/bigdecimal-takes-string
      Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric
    
    Conflicts:
    	Gemfile
    	activerecord/CHANGELOG.md
  2. @tenderlove

    bumping version

    tenderlove authored
Commits on Jan 14, 2013
  1. @floehopper

    Make tests for the presence of MiniTest consistent.

    floehopper authored
    There is an inconsistency between the conditional logic in
    the definition of ActiveSupport::TestCase and the conditional logic in
    ActiveSupport::Testing::SetupAndTeardown [1].
    
    In some circumstances, it's possible for MiniTest to be defined, but
    for ActiveSupport::TestCase *not* to have MiniTest::Unit::TestCase or
    MiniTest::Assertions in its ancestor chain. e.g. in Ruby 1.8 with the
    minitest gem included in the bundle. In this case, the
    Test::Unit/MiniTest shim/wrapper is not present and so
    Test::Unit::TestCase (and therefore ActiveSupport::TestCase) is
    completely independent of MiniTest::Unit::TestCase.
    
    The conditional logic in the definition of ActiveSupport::TestCase does
    not take this scenario into account, whereas the logic in
    ActiveSupport::Testing::SetupAndTeardown does take it into account.
    
    The changes in this commit are an alternative to the change in [2] which
    was reverted in [3].
    
    Similar conditional logic exists in ActiveSupport::Testing::Isolation
    [4], ActiveSupport::Testing::Pending [5],
    ActiveSupport::Testing::Performance [6], and in their respective tests.
    I have not addressed these, because I know less about what's going on
    there, but it would be worth bringing them all into line too.
    
    [1]
    https://github.com/rails/rails/blob/3-2-stable/activesupport/lib/active_support/testing/setup_and_teardown.rb#L13
    [2]
    c3e186e
    [3]
    267fb61
    [4]
    https://github.com/rails/rails/blob/3-2-stable/activesupport/lib/active_support/testing/isolation.rb#L41
    [5]
    https://github.com/rails/rails/blob/3-2-stable/activesupport/lib/active_support/testing/pending.rb#L14
    [6]
    https://github.com/rails/rails/blob/3-2-stable/activesupport/lib/active_support/testing/performance.rb#L17
  2. @dkubb
Commits on Jan 8, 2013
  1. @tenderlove

    Merge branch '3-2-sec' into 3-2-secmerge

    tenderlove authored
    * 3-2-sec:
      bumping version
      CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml.
      * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealing with empty hashes. Thanks Damien Mathieu
      Avoid Rack security warning no secret provided
    
    Conflicts:
    	actionpack/CHANGELOG.md
    	activerecord/CHANGELOG.md
    	activesupport/CHANGELOG.md
  2. @tenderlove

    bumping version

    tenderlove authored
  3. @jeremy @tenderlove
  4. @nashby @pixeltrix

    Wrap time ranges with timezones, closes #8807

    nashby authored pixeltrix committed
    (cherry picked from commit e2e5136)
    (cherry picked from commit dcdde7d)
    
    Backport of #6183, original issue was #6179
    
    Conflicts:
    	activesupport/lib/active_support/core_ext/time/calculations.rb
    	activesupport/test/core_ext/time_ext_test
    
    Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
Commits on Jan 3, 2013
  1. @miguelff

    Merge tag 'v3.2.10' into 3-2-stable

    miguelff authored
    Latest released tag was not fully merged into the stable branch (missed version bumping)
Commits on Dec 23, 2012
  1. @tenderlove

    bumping version to 3.2.10

    tenderlove authored
Commits on Dec 15, 2012
  1. @zbskii @steveklabnik

    Remove unicode character encoding from ActiveSupport::JSON.encode

    zbskii authored steveklabnik committed
    The encoding scheme (e.g. ☠ -> "\u2620") was broken for characters
    not in the Basic Multilingual Plane.  It is possible to escape them
    for json using the weird encoding scheme of a twelve-character
    sequence representing the UTF-16 surrogate pair (e.g. '𠜎' ->
    "\u270e\u263a") but this wasn't properly handled in the escaping code.
    Since raw UTF-8 is allowed in json, it was decided to simply pass
    through the raw bytes rather than attempt to escape them.
    
    Backport of zbskii@9ace3a8
    
    Conflicts:
    
    	activesupport/CHANGELOG.md
    	activesupport/lib/active_support/json/encoding.rb
    	activesupport/test/json/encoding_test.rb
Commits on Dec 11, 2012
  1. @carlosantoniodasilva

    Add :nsec format only for Ruby 1.9

    carlosantoniodasilva authored
    Ruby 1.8 does not support this format in Time, so the format will only
    be added to the available date formats on Ruby 1.9. Changelog entry was
    changed to explain that as well.
Commits on Dec 10, 2012
  1. @jeremy @rafaelfranca

    Merge pull request #6376 from jgaskins/timestamp-microseconds

    jeremy authored rafaelfranca committed
    Increase numeric-timestamp precision to nanoseconds
    Conflicts:
    	activesupport/lib/active_support/core_ext/time/conversions.rb
Commits on Dec 4, 2012
  1. @carlosantoniodasilva

    Use send in Time marshal extensions since the methods are now private

    carlosantoniodasilva authored
    See ruby/ruby@9c1b316
    
    All Active Support tests pass in 2.0.0preview2 after this change.
    Closes #8409
Commits on Nov 30, 2012
  1. @route
Commits on Nov 13, 2012
  1. @carlosantoniodasilva

    Revert "Use MiniTest in Ruby 1.8 if it is available."

    carlosantoniodasilva authored
    This reverts commit c3e186e.
    
    Reason: too many incompatibilities make a lot of Rails tests fail in 1.9.
    Might need more work to get this done properly in 3-2 if necessary.
  2. @carlosantoniodasilva
  3. @carlosantoniodasilva

    Merge pull request #8200 from freerange/3-2-stable-with-mocha-fixes

    carlosantoniodasilva authored
    Fix 3-2-stable to work with Mocha v0.13.0
  4. @floehopper
  5. @floehopper

    Fix for Test::Unit Mocha compatibility.

    floehopper authored
    Mocha is now using a single AssertionCounter which needs a reference to
    the testcase as opposed to the result.
    
    This change is an unfortunate consequence of the copying of a chunk of
    Mocha's internal code in order to monkey-patch Test::Unit.
  6. @floehopper

    Use MiniTest in Ruby 1.8 if it is available.

    floehopper authored
    ActiveSupport::TestCase was always inheriting from Test::Unit::TestCase.
    This works fine in Ruby 1.9 where Test::Unit::TestCase is a thin wrapper
    around MiniTest::Unit::TestCase, but does not work in Ruby 1.8 if the
    MiniTest gem is used. What happens is that ActiveSupport inherits from
    the Test::Unit::TestCase provided by the standard library, but then
    since Minitest is defined, it then seems to proceed on the assumption
    that ActiveSupport::TestCase has MiniTest::Unit::TestCase in its
    ancestor chain. However, in this case it does not.
    
    The fix is simply to choose which test library TestCase to inherit from
    using the same logic used elsewhere to detect MiniTest.
    
    I noticed this bug causing issues when using MiniTest and Mocha
    in Ruby 1.8, but there may well be other issues.
  7. @floehopper

    Copy Mocha bug fix.

    floehopper authored
    A bug was fixed [1] in Mocha's integration with Test::Unit, but this
    monkey-patching code was copied before the fix. We need to copy the
    fixed version.
    
    The bug meant that an unexpected invocation against a mock within the
    teardown method caused a test *error* and not a test *failure*.
    
    [1]
    freerange/mocha@f1ff647#diff-5
  8. @senny

    backport #8185, `#as_json` isolates options when encoding a hash.

    senny authored
    Setting options in a custom `#as_json` method had side effects.
    Modifications of the `options` hash leaked outside and influenced
    the conversion of other objects contained in the hash.
    
    Conflicts:
    
    	activesupport/CHANGELOG.md
Commits on Nov 12, 2012
  1. @spastorino
  2. @spastorino

    Bump to 3.2.9

    spastorino authored
Commits on Nov 9, 2012
  1. @spastorino
  2. @spastorino

    Bump up to 3.2.9.rc3

    spastorino authored
Commits on Nov 8, 2012
  1. @fxn @carlosantoniodasilva

    Merge pull request #8027 from daenney/master

    fxn authored carlosantoniodasilva committed
    Atomic.rb assumes it may chown/chmod a file but doesn't handle the EPERM error.
    
    Conflicts:
    	activesupport/CHANGELOG.md
    	guides/source/active_support_core_extensions.md
Commits on Nov 1, 2012
  1. @spastorino

    Bump to 3.2.9.rc2

    spastorino authored
Something went wrong with that request. Please try again.