Skip to content
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

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

    do not force sanitize and whitelist protocols for auto_link

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

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

    tenderlove committed May 25, 2012
    auto_link sanitize output
  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

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

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

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

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

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

    Merge pull request #5655 from yahonda/address_ora_00918_with_oracle_f…

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

    Address an error for test_has_many_through_polymorphic_has_one

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

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

    tenderlove committed Mar 27, 2012
    Fix build for branch 3-0-stable - Ruby 1.9.3
  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

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

    Merge pull request #2621 from icco/master

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

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

    carlosantoniodasilva committed Mar 24, 2012
    Due to the hash ordering changes on Ruby 1.8.7-p358.
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

    josevalim committed Mar 23, 2012
    Fix build for branch 3-0-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.
    
    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
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
    Conflicts:
    
    	actionpack/test/controller/redirect_test.rb
Commits on Mar 7, 2012
  1. @spastorino

    Merge pull request #5319 from arunagw/fix_test_ree

    spastorino committed Mar 7, 2012
    Fix test ree 3-0-stable
  2. @arunagw
Commits on Mar 2, 2012
  1. @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-0-12' into 3-0-stable

    tenderlove committed Mar 1, 2012
    * 3-0-12:
      bumping to 3.0.12
      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.0.12

    tenderlove committed Mar 1, 2012
  3. @tenderlove

    Merge branch '3-0-stable-security' into 3-0-12

    tenderlove committed Mar 1, 2012
    * 3-0-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 @tenderlove
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.