Permalink
Commits on May 31, 2012
  1. @tenderlove

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

    * 3-0-rel:
      bumping to 3.0.13
      updating CHANGELOGs
      bumping to 3.0.13.rc1
    tenderlove committed May 31, 2012
  2. @tenderlove

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

    * 3-0-stable-sec:
      Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
      predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
    tenderlove committed May 31, 2012
  3. @tenderlove

    bumping to 3.0.13

    tenderlove committed May 31, 2012
  4. @tenderlove

    updating CHANGELOGs

    tenderlove committed May 31, 2012
  5. @tenderlove

    Merge branch '3-0-stable-sec' into 3-0-rel

    * 3-0-stable-sec:
      Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
      predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
    tenderlove committed May 31, 2012
Commits on May 30, 2012
  1. @tenderlove

    Strip [nil] from parameters hash.

    Thanks to Ben Murphy for reporting this!
    
    CVE-2012-2660
    
    Conflicts:
    
    	actionpack/lib/action_dispatch/http/request.rb
    tenderlove committed May 30, 2012
  2. @tenderlove

    predicate builder should not recurse for determining where columns.

    Thanks to Ben Murphy for reporting this
    
    CVE-2012-2661
    tenderlove committed May 30, 2012
Commits on May 28, 2012
  1. @tenderlove

    bumping to 3.0.13.rc1

    tenderlove committed May 28, 2012
Commits on May 27, 2012
  1. @rafaelfranca
Commits on May 26, 2012
  1. @rafaelfranca

    Merge pull request #6495 from homakov/3-0-stable

    auto_link shouldn't always sanitize
    rafaelfranca committed May 26, 2012
  2. @homakov

    do not force sanitize and whitelist protocols for auto_link

    sanitize is not always required so we cannot make it. let's just
    whitelist protocols
    homakov committed May 26, 2012
Commits on May 25, 2012
  1. @tenderlove

    Merge pull request #6485 from homakov/3-0-stable

    auto_link sanitize output
    tenderlove committed May 25, 2012
  2. @homakov

    auto_link final sanitize

    homakov committed May 25, 2012
Commits on Apr 30, 2012
  1. @pixeltrix

    Lock mocha gem to fix the build

    New versions of mocha don't allow nil.stubs
    pixeltrix committed Apr 30, 2012
  2. @wycats

    Merge pull request #5044 from dracco/3-0-stable

    Backport Bugfix: Stack Overflow (3-0-stable)
    wycats committed Apr 30, 2012
Commits on Mar 29, 2012
  1. @jeremy

    Merge pull request #5659 from carlosantoniodasilva/fix-build-3-0

    Fix build for branch 3-0-stable - ARes and ordered hash keys
    jeremy committed Mar 29, 2012
  2. @carlosantoniodasilva
  3. @spastorino

    Merge pull request #5655 from yahonda/address_ora_00918_with_oracle_f…

    …or_3_0
    
    Address an error for test_has_many_through_polymorphic_has_one with Oracle
    spastorino committed Mar 29, 2012
  4. @yahonda

    Address an error for test_has_many_through_polymorphic_has_one

    with Oracle for the 3-0-stable branch
    yahonda committed Mar 29, 2012
Commits on Mar 27, 2012
  1. @tenderlove

    Merge pull request #5613 from carlosantoniodasilva/fix-build-3-0-193

    Fix build for branch 3-0-stable - Ruby 1.9.3
    tenderlove committed Mar 27, 2012
  2. @josevalim @drogus
  3. @arunagw @carlosantoniodasilva
  4. @tenderlove @carlosantoniodasilva
  5. @miloops @carlosantoniodasilva
  6. @miloops @carlosantoniodasilva
  7. @josevalim

    Merge pull request #5600 from carlosantoniodasilva/fix-build-3-0

    Fix build for branch 3-0-stable - failing in ruby 1.8.8-p358
    josevalim committed Mar 27, 2012
  8. @tenderlove

    Merge pull request #2621 from icco/master

    Issue with schema dump
    tenderlove committed Mar 27, 2012
Commits on Mar 26, 2012
  1. @carlosantoniodasilva

    Fix AV::FixtureResolver and rjs tests with random order errors

    Due to the hash ordering changes on Ruby 1.8.7-p358.
    carlosantoniodasilva committed Mar 24, 2012
Commits on Mar 24, 2012
  1. @arunagw @carlosantoniodasilva
Commits on Mar 23, 2012
  1. @josevalim

    Merge pull request #5565 from carlosantoniodasilva/fix-build-3-0

    Fix build for branch 3-0-stable
    josevalim committed Mar 23, 2012
  2. @carlosantoniodasilva
  3. @carlosantoniodasilva

    Add order to tests that rely on db ordering, to fix failing tests on pg

    Also skip persistente tests related to UPDATE + ORDER BY for postgresql
    
    PostgreSQL does not support updates with order by, and these tests are
    failing randomly depending on the fixture loading order now.
    
    Conflicts:
    
    	activerecord/test/cases/associations/join_model_test.rb
    	activerecord/test/cases/associations/nested_through_associations_test.rb
    	activerecord/test/cases/clone_test.rb
    	activerecord/test/cases/dup_test.rb
    	activerecord/test/cases/relations_test.rb
    	activerecord/test/cases/yaml_serialization_test.rb
    carlosantoniodasilva committed Mar 22, 2012
Commits on Mar 15, 2012
  1. @tenderlove

    Merge pull request #5457 from brianmario/typo-fix

    Fix typo in redirect test
    tenderlove committed Mar 15, 2012
  2. @tenderlove

    Merge pull request #5456 from brianmario/redirect-sanitization

    Strip null bytes from Location header
    Conflicts:
    
    	actionpack/test/controller/redirect_test.rb
    tenderlove committed Mar 15, 2012
Commits on Mar 7, 2012
  1. @spastorino

    Merge pull request #5319 from arunagw/fix_test_ree

    Fix test ree 3-0-stable
    spastorino committed Mar 7, 2012