aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Move mail gem dep to Action Mailer's gemspecJeremy Kemper2009-12-292-4/+1
* Merge branch 'master' of git://github.com/mikel/rails into mailJeremy Kemper2009-12-29340-5815/+6374
|\
| * Adding default 8bit encoding if the body has non usascii in itMikel Lindsaar2009-12-282-1/+3
| * Remove unused code paths and require mail only when it's needed.José Valim2009-12-283-17/+9
| * Moved sort_parts into Mail, updated mail requirement to 1.4.2Mikel Lindsaar2009-12-285-40/+22
| * DRY ActionMailer code.José Valim2009-12-271-60/+61
| * Getting rid of some warnings in AM suite.José Valim2009-12-274-8/+10
| * Merge Mail with latest Rails and move mail gem to Gemfile.José Valim2009-12-27175-3154/+3185
| |\
| | * Add find(ids) to relationsPratik Naik2009-12-273-2/+91
| | * Make Model.all return an array rather than a relation for consistency. Use Mo...Pratik Naik2009-12-272-3/+9
| | * Fix dynamic finder docsPratik Naik2009-12-271-3/+2
| | * Make Model.find_or_create_by_* and find_or_initialize_by_* use relations and ...Pratik Naik2009-12-273-64/+5
| | * Add find_or_create_by_* and find_or_initialize_by_* to relationsPratik Naik2009-12-272-0/+44
| | * Make Model.find_by_* and Model.find_all_by_* use relations and remove dynamic...Pratik Naik2009-12-274-124/+38
| | * Require bundled environment, if present, so Active Support can load i18nJeremy Kemper2009-12-261-0/+5
| | * script/server should init Rails by loading config.ruJoshua Peek2009-12-262-18/+8
| | * Add find_by_* and find_all_by_* finders to ActiveRecord::RelationPratik Naik2009-12-272-1/+47
| | * Replace Model.first(options) with new finder methods inside testsPratik Naik2009-12-272-3/+3
| | * AD::Cascade that supports X-CascadeJoshua Peek2009-12-262-0/+30
| | * rack-mount 0.4Joshua Peek2009-12-263-21/+21
| | * Expect Rack 1.1Joshua Peek2009-12-261-1/+1
| | * Add new finder methods to association collection.Pratik Naik2009-12-277-13/+38
| | * Ensure Model.scoped adds type conditions for STI modelsPratik Naik2009-12-273-12/+16
| | * Ensure all the finder methods respect scopingPratik Naik2009-12-262-2/+7
| | * Add relation.reload to force reloading the recordsPratik Naik2009-12-263-0/+29
| | * Cache the loaded relationsPratik Naik2009-12-262-33/+75
| | * Ensure preload and eager_load finder methods accept multiple argumentsPratik Naik2009-12-262-6/+12
| | * Make sure the relations are always immutablePratik Naik2009-12-261-8/+5
| | * Add support for multiple arguments to .where finderPratik Naik2009-12-262-2/+8
| | * Add missing changelog entriesPratik Naik2009-12-261-0/+25
| | * Add Relation#all as an alias for to_aPratik Naik2009-12-262-0/+8
| | * Stop supporting blank arguments to AR#relation query methodsPratik Naik2009-12-261-27/+19
| | * Rename Model.conditions and relation.conditions to .wherePratik Naik2009-12-267-20/+20
| | * No parentheses for assert_equalPratik Naik2009-12-261-6/+6
| | * Add Model.select/group/order/limit/joins/conditions/preload/eager_load class ...Pratik Naik2009-12-264-59/+88
| | * Merge remote branch 'jose/am'Yehuda Katz2009-12-2524-1422/+113
| | |\
| | | * Fix whiny_nil tests, improve error messages and make CI happy.José Valim2009-12-251-6/+7
| | | * Refactor multiple parts logic and move Utils to PartContainer.José Valim2009-12-254-31/+24
| | | * adv_attr_accessors in ActionMailer are not sent to the views, use the mailer ...José Valim2009-12-256-42/+79
| | | * Move i18n to Gemfile.José Valim2009-12-2515-1345/+5
| | | * Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-2581-915/+960
| | | |\
| | | * \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-2235-294/+508
| | | |\ \
| | | * \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-21114-857/+1820
| | | |\ \ \
| | | * \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-1199-1592/+1833
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-0277-295/+439
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-0117-476/+545
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-11-2520-142/+154
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-11-2414-255/+177
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-11-232-3/+3
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-11-2388-1537/+907
| | | |\ \ \ \ \ \ \ \ \ \