Permalink
Commits on Apr 16, 2012
  1. Merge pull request #5862 from arunagw/multi_json_fix_3-1-stable

    jeremy committed Apr 16, 2012
    Restrict multi_json to >= 1.0, < 1.3 to avoid API changes in 1.3
  2. multi_json is restricted to < 1.3.

    arunagw committed Apr 16, 2012
    Some API changes are there above 1.3.
Commits on Apr 3, 2012
  1. Merge pull request #5686 from arunagw/issue_4083

    josevalim committed Apr 3, 2012
    Issue 4083
Commits on Mar 31, 2012
  1. CHANGELOG entry added

    arunagw committed Mar 31, 2012
  2. :subdomain can now be specified with a value of false in url_for,

    arunagw committed Mar 31, 2012
    allowing for subdomain(s) removal from the host during link generation. 
    
    Closes #4083
    
    cherry-picked from 
    
    de942e5
    96aa3bd
Commits on Mar 29, 2012
  1. Merge pull request #5658 from yahonda/address_ora_00918_with_oracle_f…

    spastorino committed Mar 29, 2012
    …or_3_1
    
    Address an error for test_has_many_through_polymorphic_has_one with Oracle
  2. Merge pull request #5647 from arturopie/fixing_IM_when_using_find_select

    tenderlove committed Mar 29, 2012
    Fixing Identity Map when using find select
  3. Address an error for test_has_many_through_polymorphic_has_one

    yahonda committed Mar 29, 2012
    with Oracle for the 3-1-stable branch
  4. refactor instantiate method in base, so we remove nesting if's which …

    arturopie committed Mar 27, 2012
    …make the code harder to read. Minor changes to contain_all_columns in IdentityMap.
Commits on Mar 28, 2012
  1. refactor the checking of the attributes of the record in IdentityMap#…

    arturopie committed Mar 27, 2012
    …add, so it's more readable
  2. Do not add record to identity map if the record doesn't have values f…

    arturopie committed Mar 26, 2012
    …or all the columns, so we don't get 'MissingAttributeError' later when trying to access other fields of the same record.
Commits on Mar 27, 2012
  1. Merge pull request #2621 from icco/master

    tenderlove committed Mar 27, 2012
    Issue with schema dump
Commits on Mar 26, 2012
  1. Merge pull request #5599 from carlosantoniodasilva/fix-build-3-1

    tenderlove committed Mar 26, 2012
    Fix build for branch 3-1-stable - return the same session hash object
  2. Return the same session data object when setting session id

    carlosantoniodasilva committed Mar 24, 2012
    Make sure to return the same hash object instead of returning a new one.
    Returning a new one causes failures on cookie store tests, where it
    tests for the 'Set-Cookie' header with the session signature.
    
    This is due to the hash ordering changes on Ruby 1.8.7-p358.
Commits on Mar 23, 2012
  1. Merge pull request #5564 from carlosantoniodasilva/fix-build-3-1

    josevalim committed Mar 23, 2012
    Fix build for branch 3-1-stable
  2. Add order to tests that rely on db ordering, to fix failing tests on pg

    carlosantoniodasilva committed Mar 22, 2012
    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.
Commits on Mar 19, 2012
  1. Merge pull request #5506 from arunagw/build_fix_1.8.7-3-1-stable

    josevalim committed Mar 19, 2012
    Build fix 1.8.7 3 1 stable
  2. Merge pull request #5504 from arunagw/build_fix_1-8-7

    josevalim committed Mar 19, 2012
    Build fix 1 8 7
  3. fix test failing in 1.8.7

    arunagw committed Mar 19, 2012
  4. Increase minimum version of mail.

    mikel committed Mar 19, 2012
      Second security vulnerability found in mail file delivery method
      patched in version 2.3.3.
Commits on Mar 15, 2012
  1. Merge pull request #5457 from brianmario/typo-fix

    tenderlove committed Mar 15, 2012
    Fix typo in redirect test
  2. Merge pull request #5456 from brianmario/redirect-sanitization

    tenderlove committed Mar 15, 2012
    Strip null bytes from Location header
Commits on Mar 13, 2012
  1. Merge pull request #5401 from arunagw/issue_4409_3-1-stable

    josevalim committed Mar 13, 2012
    Issue 4409 3 1 stable
  2. fix activerecord query_method regression with offset into Fixnum

    denisj committed with arunagw Jan 11, 2012
    add test to show offset query_methods on mysql & mysql2
    
    change test to cover public API
Commits on Mar 12, 2012
  1. Merge pull request #5312 from kennyj/fix_3927-31

    tenderlove committed Mar 12, 2012
    [3-1-stable] Use 1.9 native XML escaping to speed up html_escape and shush regexp warnings
Commits on Mar 7, 2012
  1. Merge pull request #5322 from arunagw/test_fix_1.8.7-3-1-stable

    spastorino committed Mar 7, 2012
    Test fix 1.8.7 3 1 stable
  2. Test fix failing in 1.8.7-p358

    arunagw committed Mar 7, 2012
  3. Use 1.9 native XML escaping to speed up html_escape and shush regexp …

    jeremy committed with kennyj Dec 11, 2011
    …warnings
    
            length      user     system      total        real
    before  6      0.010000   0.000000   0.010000 (  0.012378)
    after   6      0.010000   0.000000   0.010000 (  0.012866)
    before  60     0.040000   0.000000   0.040000 (  0.046273)
    after   60     0.040000   0.000000   0.040000 (  0.036421)
    before  600    0.390000   0.000000   0.390000 (  0.390670)
    after   600    0.210000   0.000000   0.210000 (  0.209094)
    before  6000   3.750000   0.000000   3.750000 (  3.751008)
    after   6000   1.860000   0.000000   1.860000 (  1.857901)
Commits on Mar 6, 2012
  1. Use latest rack-cache.

    josevalim committed Mar 6, 2012
  2. Increasing minimum version of mail due to security vulnerability foun…

    mikel committed Mar 6, 2012
    …d in Mail 2.3.0 for sendmail or exim
Commits on Mar 4, 2012