aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Move the code which builds a scope for through associations into a generic As...Jon Leighton2011-03-109-215/+162
* Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-0725-44/+193
|\
| * do not test explicit equality of predicate methods, they should be allowed to...Aaron Patterson2011-03-072-8/+4
| * refactor calls to to_param in expand_key methodAaron Patterson2011-03-071-9/+10
| * Referencing a table via the ON condition in a join should force that table to...Jon Leighton2011-03-072-1/+27
| * Merge branch 'master' of github.com:rails/railsAaron Patterson2011-03-0723-27/+179
| |\
| | * Merge branch 'active_model_unused_variable' of https://github.com/pacoguzman/...Xavier Noria2011-03-071-1/+1
| | |\
| | | * remove unused assigned variablePaco Guzman2011-03-061-1/+1
| | * | Fixed indentation in actionmailer base_test [#6538 state:committed]Dalibor Nasevic2011-03-071-2/+2
| | |/
| | * removes merge conflictsXavier Noria2011-03-062-15/+0
| | * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-0612-15/+47
| | |\
| | | * removes Examples headers introduced in 9b96de6Xavier Noria2011-03-061-10/+4
| | | * Revert "Fixed identation in actionmailer base_test"Xavier Noria2011-03-061-2/+2
| | | * more style changessuchasurge2011-03-062-2/+2
| | | * Some style changessuchasurge2011-03-065-5/+11
| | | * style changesJudeArasu2011-03-061-3/+5
| | | * Revert "style changes"JudeArasu2011-03-061-3/+3
| | | * style changesJudeArasu2011-03-061-3/+3
| | | * styles applied for usageJudeArasu2011-03-061-3/+4
| | | * Fixed identation in actionmailer base_testDalibor Nasevic2011-03-061-2/+2
| | | * wrong SQL statementAkira Matsuda2011-03-061-1/+1
| | | * merges railsXavier Noria2011-03-0598-1334/+2114
| | | |\
| | | * | commas to set off expressions that interrupt sentence flowJudeArasu2011-03-051-1/+1
| | | * | typo changesJudeArasu2011-03-051-1/+1
| | | * | typo changesJudeArasu2011-03-051-1/+2
| | | * | Railties typos.R.T. Lechow2011-03-044-6/+6
| | | * | Action Pack typos.R.T. Lechow2011-03-0411-15/+15
| | | * | Active Record typos.R.T. Lechow2011-03-046-10/+10
| | | * | Active Support typos.R.T. Lechow2011-03-047-7/+7
| | | * | Active Resource typos.R.T. Lechow2011-03-045-6/+6
| | | * | Active Model typos.R.T. Lechow2011-03-042-2/+2
| | | * | Merge remote branch 'origin/master'Jonathon D. Jones2011-03-031-1/+1
| | | |\ \
| | | | * | Properly escaped a + in the dynamic segments TIPtashian2011-03-031-1/+1
| | | * | | Adds link to Object.blank? from Object.present?Jonathon D. Jones2011-03-031-1/+1
| | | |/ /
| | | * | fixes a missmatched column in examplemjy2011-03-031-1/+1
| | | * | Spelling mistakeJudeArasu2011-03-031-1/+2
| | | * | Correct spelling for Base64 in action_mailerDalibor Nasevic2011-03-031-1/+1
| | | * | Removed link to un-existing Issues page on GithubDalibor Nasevic2011-03-011-3/+0
| | | * | Added some new advice on applying patchesLars Smit2011-02-281-0/+14
| | | * | Fix incorrect example.Ben Orenstein2011-02-271-2/+2
| | | * | Fix incorrect word.Ben Orenstein2011-02-271-1/+1
| | | * | Pointing out that dynamic_form plugin must be installed to be able to use err...Rodrigo Navarro2011-02-271-1/+14
| | | * | Clean up wording.Ben Orenstein2011-02-261-1/+1
| | | * | use resources in place of map.resourcesVijay Dev2011-02-271-1/+1
| | | * | Clarify comment by removing french reference ('a la'). Should improve readabi...Ben Orenstein2011-02-261-1/+1
| | | * | Example descriptions and their examples were flipped. Fix.Ben Orenstein2011-02-261-3/+3
| | | * | Warn people that these methods are deprecated.Ben Orenstein2011-02-261-0/+2
| | | * | Correct example that did not do what it claimed. Rework explanation.Ben Orenstein2011-02-261-5/+5
| | | * | added information about TEST_DIR env variableIlya Zayats2011-02-261-0/+8
| | * | | Report the correct value of nil.id in the exception messageAndrew White2011-03-062-1/+3