aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixing typo in association class nameJack Danger Canty2008-05-061-1/+1
* doc: disambiguating an example ActiveRecord classJack Danger Canty2008-05-061-1/+2
* doc: ActiveRecord::Reflection::AssociationReflection#through_reflectionJack Danger Canty2008-05-061-0/+11
* Merge branch 'master' of git@github.com:lifo/docrailsCheah Chu Yeow2008-05-071-17/+7
|\
| * Merge branch 'master' of git@github.com:lifo/docrailsJohn Barnette2008-05-061-1/+4
| |\
| * | Killing/fixing a bunch of outdated language in the AR README.John Barnette2008-05-061-17/+7
* | | Document AttributeAssignmentError and MultiparameterAssignmentErrors.Cheah Chu Yeow2008-05-071-5/+10
| |/ |/|
* | Make a note about ActiveResource::Timeouterror being raised when ARes calls t...Cheah Chu Yeow2008-05-071-1/+4
|/
* fixed a misplaced closing tagXavier Noria2008-05-071-1/+1
* revised a few of filenamesXavier Noria2008-05-071-3/+5
* revised a couple of filenamesXavier Noria2008-05-071-2/+2
* revised conventions in rails/plugin.rbXavier Noria2008-05-071-8/+8
* revised conventions in ActiveResource::BaseXavier Noria2008-05-071-129/+93
* improvements to the page caching docsJonathan Dance2008-05-062-9/+15
* Merge commit 'mainstream/master'Pratik Naik2008-05-0612-20/+111
|\
| * Delegate action_name to controller inside views.Pratik Naik2008-05-062-1/+10
| * Add class to deprecate instance variablesPratik Naik2008-05-062-0/+24
| * Refactored and fixed Resources.map_member_actions to make use of custom Actio...Marcos Arias2008-05-062-9/+29
| * Added logic to associations.rb to make sure select_for_limited_idsJohn Devine2008-05-062-1/+33
| * Ensure correct record is returned when preloading has_one where more than one...Frederick Cheung2008-05-063-1/+12
| * Merge branch 'master' of git@github.com:rails/railsMichael Koziarski2008-05-0616-241/+320
| |\
| * | PostgreSQL: update rake tasks to use full settings from database.ymlPete Deffendol2008-05-041-8/+3
* | | Merge commit 'mainstream/master'Pratik Naik2008-05-0616-241/+320
|\ \ \ | | |/ | |/|
| * | Fixed form helper's name attribute for question methodsAndrew Vit2008-05-062-5/+18
| * | Fix bug where plugin init.rb files from frozen gem specs weren't being run. ...rick2008-05-061-0/+2
| * | Merge commit 'e792d4ab70448f79142fdf492390682ff5ea6398'rick2008-05-051-1/+2
| |\ \
| | * | Added code to make initialization process call rails/init.rb for unpacked gemsPaul Barry2008-05-061-1/+2
| * | | regression test for bug introduced in [6a6b4392c16c665eb713705f2b38e959a658ee...rick2008-05-051-0/+13
| * | | Allow ActionController::Base#default_url_options to have a default options ar...Cheah Chu Yeow2008-05-053-5/+5
| * | | Restore dump_schema_information connection adapter methodKyle Hargraves2008-05-051-0/+6
| * | | Merge commit 'core/master'rick2008-05-05163-1150/+2333
| |\| |
| | * | Added Ruby 1.8 implementation of Process.daemonJoshua Peek2008-05-054-10/+30
| | * | Added OrderedHash#delete [#113 state:resolved]Sean Ouimet2008-05-052-0/+19
| | * | Preload TimeZone zones for thread safety.Joshua Peek2008-05-041-217/+222
| | * | Replaced unnecessary class variable with a constant in whiny nil.Joshua Peek2008-05-041-3/+3
| | |/
| * | Merge branch 'master' of git@github.com:rails/railsrick2008-04-23146-3858/+1696
| |\ \
| * \ \ Merge branch 'master' of git@github.com:rails/railsrick2008-04-177-8/+34
| |\ \ \
| * \ \ \ Merge commit 'stephencelis/master' into asset_shitrick2008-04-134-11/+13
| |\ \ \ \
* | | | | | revised conventions in AR's validations.rbXavier Noria2008-05-051-2/+2
* | | | | | revised conventions in associations.rbXavier Noria2008-05-051-28/+28
* | | | | | revised list conventions in AM's numericality.rbXavier Noria2008-05-051-11/+11
* | | | | | revised list conventions in AM's validates_associatedXavier Noria2008-05-051-1/+1
* | | | | | revised conventions in url_for docsXavier Noria2008-05-051-7/+7
* | | | | | revised conventions in resources.rbXavier Noria2008-05-051-17/+17
* | | | | | revised convention for lists in request_forgery_protection.rbXavier Noria2008-05-051-2/+2
* | | | | | revised convention for lists in action_mailer/base.rbXavier Noria2008-05-051-10/+11
* | | | | | validates_numericality_of() "integer" option really is "only_integer"Sunny Ripert2008-05-051-2/+2
* | | | | | Harmonized hash notation in AR::BaseSunny Ripert2008-05-051-5/+5
* | | | | | Turned options into rdoc-lists in AR::BaseSunny Ripert2008-05-051-22/+22
* | | | | | Added information of how to set element_name in the case the user has a name ...Marshall Huss2008-05-041-1/+8