Skip to content
Commits on Mar 27, 2012
  1. @tenderlove

    Merge pull request #2621 from icco/master

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

    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. @carlosantoniodasilva

    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. @josevalim

    Merge pull request #5564 from carlosantoniodasilva/fix-build-3-1

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

    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. @josevalim

    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. @arunagw
  3. @josevalim

    Merge pull request #5504 from arunagw/build_fix_1-8-7

    josevalim committed Mar 18, 2012
    Build fix 1 8 7
  4. @arunagw

    fix test failing in 1.8.7

    arunagw committed Mar 19, 2012
  5. @mikel

    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. @tenderlove

    Merge pull request #5457 from brianmario/typo-fix

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

    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. @josevalim

    Merge pull request #5401 from arunagw/issue_4409_3-1-stable

    josevalim committed Mar 13, 2012
    Issue 4409 3 1 stable
  2. @denisj @arunagw

    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. @tenderlove

    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. @spastorino

    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. @arunagw

    Test fix failing in 1.8.7-p358

    arunagw committed Mar 7, 2012
  3. @jeremy @kennyj

    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. @josevalim

    Use latest rack-cache.

    josevalim committed Mar 6, 2012
  2. @mikel

    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
  1. @carlosantoniodasilva @drogus
Commits on Mar 2, 2012
  1. @tenderlove

    only log an error if there is a logger. fixes #5226

    tenderlove committed Mar 2, 2012
    Conflicts:
    
    	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
    
    Conflicts:
    
    	activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
  2. @carlosantoniodasilva @drogus

    Stop SafeBuffer#clone_empty from issuing warnings

    carlosantoniodasilva committed with drogus Mar 2, 2012
    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-1-4' into 3-1-stable

    tenderlove committed Mar 1, 2012
    * 3-1-4:
      bumping to 3.1.4
      Ensure [] respects the status of the buffer.
      updating RAILS_VERSION
      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.1.4

    tenderlove committed Mar 1, 2012
  3. @tenderlove

    Merge branch '3-1-stable-security' into 3-1-4

    tenderlove committed Mar 1, 2012
    * 3-1-stable-security:
      Ensure [] respects the status of the buffer.
      use AS::SafeBuffer#clone_empty for flushing the output_buffer
      add AS::SafeBuffer#clone_empty
      fix output safety issue with select options
  4. @josevalim

    Merge pull request #5227 from arunagw/build_fix_3-1-stable

    josevalim committed Mar 1, 2012
    Build fix 3 1 stable
  5. @arunagw
  6. @josevalim @tenderlove
Commits on Feb 29, 2012
  1. @tenderlove

    Merge pull request #5207 from kennyj/fix_5173-31

    tenderlove committed Feb 29, 2012
    [3-1-stable] Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931
Commits on Feb 28, 2012
  1. @kennyj
Commits on Feb 27, 2012
  1. @tenderlove

    Merge pull request #5179 from RalphShnelvar/Binary_mode_Window_bug

    tenderlove committed Feb 27, 2012
    Binary mode window bug
Commits on Feb 26, 2012
  1. @pixeltrix
Commits on Feb 25, 2012
  1. @noahhendrix @vijaydev

    Fixed typo in composed_of example with Money#<=>, was comparing amoun…

    noahhendrix committed with vijaydev Feb 24, 2012
    …t itself instead of other_money.amount
Something went wrong with that request. Please try again.