Permalink
Switch branches/tags
Nothing to show
Commits on Dec 11, 2008
  1. Merge commit 'mainstream/master'

    lifo committed Dec 11, 2008
    Conflicts:
    
    	railties/doc/guides/html/activerecord_validations_callbacks.html
    	railties/doc/guides/source/activerecord_validations_callbacks.txt
  2. Fix for Integration::Session follow_redirect! headers['location'] bug…

    Christos Zisopoulos committed with josh Dec 11, 2008
    … with Rack [#1555 state:resolved]
    
    Signed-off-by: Joshua Peek <josh@joshpeek.com>
Commits on Dec 10, 2008
  1. Don't use the transaction instance method so that people with has_one…

    fcheung committed with jeremy Dec 10, 2008
    …/belongs_to :transaction aren't fubared
    
    [#1551 state:committed]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
  2. Squash memory leak when calling flush with an empty buffer

    fcheung committed with jeremy Dec 10, 2008
    [#1552 state:committed]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
  3. Revert "Fix: counter_cache should decrement on deleting associated re…

    jeremy committed Dec 10, 2008
    …cords."
    
    [#1196 state:open]
    
    This reverts commit 05f2183.
  4. Added a :camelize option to ActiveRecord and Hash to_xml serializatio…

    Bruce Krysiak committed with NZKoz Dec 9, 2008
    …n and from_xml deserialization
    
    Signed-off-by: Michael Koziarski <michael@koziarski.com>
  5. Fix test names collision.

    miloops committed with jeremy Dec 10, 2008
    [#1549 state:committed]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
  6. Fix ActionController autoloads

    jeremy committed Dec 10, 2008
  7. Fix: counter_cache should decrement on deleting associated records.

    miloops committed with jeremy Dec 2, 2008
    [#1195 state:committed]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
  8. Rework ActiveSupport::OrderedHash to make lookups faster

    fcheung committed with jeremy Dec 9, 2008
    [#1352 state:committed]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Commits on Dec 9, 2008
  1. Merge branch 'master' of git@github.com:rails/rails

    jeremy committed Dec 9, 2008
    Conflicts:
    	activesupport/CHANGELOG
  2. Benchmark.ms

    jeremy committed Dec 9, 2008
  3. How'd that sneak in there?

    jeremy committed Dec 9, 2008
  4. Updated included memcache-client to the 1.5.0.5 version which include…

    dhh committed Dec 9, 2008
    …s fixes from fiveruns and 37signals to deal with failover and timeouts (Joshua Sierles) [#1535 state:committed]
    
    Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
  5. Use full path to environment

    jeremy committed Dec 9, 2008
  6. Add ActiveSupport::Multibyte::Chars#ord method so that it returns cor…

    Jason Cheow committed with jeremy Nov 26, 2008
    …rect Unicode value instead of falling back on String#ord in CoreExtensions, which is not multibyte compatible
    
    [#1483 state:committed]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Commits on Dec 8, 2008
  1. Changelog entry for #1294

    jeremy committed Dec 8, 2008
  2. Changelog entry for #1397

    jeremy committed Dec 8, 2008
  3. Make word separator in AR validation error messages configurable.

    amatsuda committed with jeremy Oct 30, 2008
    [#1294 state:committed]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
  4. Change Array#to_sentence I18n options to pass comma and space charact…

    amatsuda committed with jeremy Nov 17, 2008
    …er from outside.
    
    [#1397 state:committed]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
  5. Change field_changed? method to handle the case where a nullable inte…

    bensymonds committed with jeremy Dec 8, 2008
    …ger column is changed from 0 to '0'
    
    [#1530 state:committed]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>