Permalink
Switch branches/tags
Commits on Mar 27, 2012
  1. Fix broken encoding test

    arunagw authored and carlosantoniodasilva committed Dec 10, 2011
  2. Use helper method here.

    miloops authored and carlosantoniodasilva committed Sep 28, 2010
  3. 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
  4. Merge pull request #2621 from icco/master

    tenderlove committed Mar 27, 2012
    Issue with schema dump
Commits on Mar 26, 2012
  1. 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
Commits on Mar 23, 2012
  1. Merge pull request #5565 from carlosantoniodasilva/fix-build-3-0

    josevalim committed Mar 23, 2012
    Fix build for branch 3-0-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.
    
    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. 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
    Conflicts:
    
    	actionpack/test/controller/redirect_test.rb
Commits on Mar 7, 2012
  1. Merge pull request #5319 from arunagw/fix_test_ree

    spastorino committed Mar 7, 2012
    Fix test ree 3-0-stable
Commits on Mar 2, 2012
  1. Stop SafeBuffer#clone_empty from issuing warnings

    carlosantoniodasilva authored and drogus committed 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. 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. bumping to 3.0.12

    tenderlove committed Mar 1, 2012
  3. 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
Commits on Feb 25, 2012
  1. Fixed typo in composed_of example with Money#<=>, was comparing amoun…

    noahhendrix authored and vijaydev committed Feb 24, 2012
    …t itself instead of other_money.amount
Commits on Feb 22, 2012
  1. updating RAILS_VERSION

    tenderlove committed Feb 22, 2012
Commits on Feb 21, 2012
  1. add AS::SafeBuffer#clone_empty

    amatsuda authored and tenderlove committed Feb 13, 2012
Commits on Feb 20, 2012
Commits on Feb 16, 2012
Commits on Feb 15, 2012
Commits on Jan 24, 2012
  1. Merge pull request #4514 from brainopia/update_timezone_offets

    tenderlove committed Jan 24, 2012
    Update time zone offset information
Commits on Jan 7, 2012
  1. Merge pull request #4372 from arunagw/fixed_failing_test

    josevalim committed Jan 7, 2012
    Fixed failing test
Commits on Dec 31, 2011
  1. Merge pull request #4246 from amatsuda/hashdos_30

    josevalim committed Dec 31, 2011
    bump up rack version to the one that includes the Hash DoS fix
Commits on Dec 20, 2011
  1. Merge pull request #4031 from arunagw/3-0-stable

    spastorino committed Dec 20, 2011
    3 0 stable travis sync