Permalink
Commits on Jul 9, 2011
  1. Version comparison using strings is faulty. Gem::Version is now equip…

    …ped with symbols for version comparison.
    committed Jul 9, 2011
Commits on Jul 7, 2011
  1. use Zlib.crc2 rather that bytes.sum, as per Aaron's suggestion

    That integer is rather irrelevant, the only thing that matters is that
    it is consistent and with no apparent bias. Zlib.crc32 is 8-10 times
    faster than bytes.sum, so use that.
    fxn committed Jul 7, 2011
  2. removing brittle assertion

    tenderlove committed Jul 7, 2011
  3. Merge pull request #2005 from acroca/master

    Fixing asset number for asset_path with %d to be consistent in ruby 1.9
    josevalim committed Jul 7, 2011
  4. Using the sum of bytes instead the hash of the path when replacing th…

    …e wildcard of the assets path because in ruby 1.9 is not consistent
    acroca committed Jul 7, 2011
  5. Merge pull request #1767 from jwarwick/rake_notes_dirs

    Updated rake:notes to search additional directories
    spastorino committed Jul 7, 2011
  6. Merge pull request #1997 from knapo/master

    Make `ActiveRecord::Batches#find_each` to not return `self`.
    spastorino committed Jul 7, 2011
  7. Merge pull request #1999 from dmitriy-kiriyenko/add_require_active_su…

    …pport_delegation_to_relation
    
    Add require ActiveSupport delegation to ActiveRecord::Relation class.
    fxn committed Jul 7, 2011
  8. Merge pull request #1996 from bogdan/default_sanitizer_squashed

    Rails app template: setup different mass assignment sanitizer for envs
    josevalim committed Jul 7, 2011
  9. Merge pull request #1406 from dmathieu/fix_test_warnings

    Fix test warnings
    josevalim committed Jul 7, 2011
  10. Make `ActiveRecord::Batches#find_each` to not return `self`.

    This caused that `find_each` was producing extra db call taking all the records from db, and was less efficient than `ActiveRecord::Base#all`.
    knapo committed Jul 7, 2011
  11. Rails app template: setup different mass assignment sanitizer for envs

    For production - leave the default
    For test and dev: :strict.
    bogdan committed Jun 17, 2011
  12. Merge pull request #1120 from lysenko/collection_singular_ids

    collection_singular_ids ignores association :include option
    spastorino committed Jul 7, 2011
  13. Merge pull request #1989 from simonbaird/master

    rake db:test:purge creates mysql database with wrong charset & collation (master branch)
    spastorino committed Jul 7, 2011
  14. Don't construct association scope in initializer. This yields a big p…

    …erformance gain for cases where the association is never used to load the target, for example with preloading. Related: #1873.
    jonleighton committed Jul 7, 2011
Commits on Jul 6, 2011
  1. Fix charset/collate in mysql recreate_database

    See new method mysql_creation_options. It is used by both
    create_database and recreate_database so they are consistent.
    
    (Cherry pick of 3ba3125)
    simonbaird committed Jul 6, 2011
  2. Remove stream at the class level.

    This is because only template rendering works with streaming.
    Setting it at the class level was also changing the behavior
    of JSON and XML responses, closes #1337.
    josevalim committed Jul 6, 2011
  3. Merge pull request #1987 from ernie/fix_fix_to_reverse_sql_order

    Remove case statement changes from 2e0840d and 56ac32a. Inheritance FTW.
    jonleighton committed Jul 6, 2011
  4. Fix bug in collection_singular_ids on has many through association wi…

    …th conditions and includes,
    
    when condtions references tables from includes.
    Test fail because of invalid sql:
    ActiveRecord::StatementInvalid: SQLite3::SQLException: no such column: comments.id:
    SELECT "posts".id FROM "posts" INNER JOIN "readers" ON "posts"."id" = "readers"."post_id"
    WHERE "readers"."person_id" = 1 AND (comments.id is null)
    
    Bug described in github#925
    
    This commit will revert fix from rails@3436fdf , but tests is ok.
    
    Bug described in #6569 ticket.
    lysenko committed Mar 27, 2011
  5. Merge pull request #1273 from jeremyf/feature-association-proxy-send

    Addresses an inconsistency in the ActiveRecord::Base.method_missing handl
    spastorino committed Jul 6, 2011
  6. Merge pull request #1463 from psanford/master

    Fix timezone handling in String.to_time
    spastorino committed Jul 6, 2011
  7. Merge pull request #1494 from anildigital/master

    Fix failing test because of Timezone difference.
    spastorino committed Jul 6, 2011
  8. Merge pull request #1926 from tobsch/master

    Accept application.js/.css to exist in a deeper directory depth by default
    spastorino committed Jul 6, 2011
  9. Merge pull request #1979 from bogdan/association_sum_array_compatibility

    Fixed AR::Relation#sum compatibility with Array#sum
    jonleighton committed Jul 6, 2011
Commits on Jul 5, 2011