aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Referencing a table via the ON condition in a join should force that table ↵Jon Leighton2011-03-072-1/+27
| | | | to be eager-loaded via a JOIN rather than via subsequent queries.
* Merge branch 'master' of github.com:rails/railsAaron Patterson2011-03-0723-27/+179
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of github.com:rails/rails: (44 commits) Fixed indentation in actionmailer base_test [#6538 state:committed] remove unused assigned variable removes merge conflicts removes Examples headers introduced in 9b96de6 Revert "Fixed identation in actionmailer base_test" Report the correct value of nil.id in the exception message as different ruby implementations may have different values, for example Rubinius returns 53 for nil.id. Improve testing of cookies in functional tests: - cookies can be set using string or symbol keys - cookies are preserved across calls to get, post, etc. - cookie names and values are escaped - cookies can be cleared using @request.cookies.clear more style changes Some style changes style changes Revert "style changes" Raise ArgumentError if route name is invalid [#6517 state:resolved] style changes Allow model to be inherited from Hash [#6487 state:resolved] styles applied for usage added failing test for fields_for with a record object that inherits from Hash Fixed identation in actionmailer base_test wrong SQL statement commas to set off expressions that interrupt sentence flow typo changes ...
| * Merge branch 'active_model_unused_variable' of ↵Xavier Noria2011-03-071-1/+1
| |\ | | | | | | | | | https://github.com/pacoguzman/rails into pacoguzman-active_model_unused_variable
| | * remove unused assigned variablePaco Guzman2011-03-061-1/+1
| | |
| * | Fixed indentation in actionmailer base_test [#6538 state:committed]Dalibor Nasevic2011-03-071-2/+2
| |/ | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
| * 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
| | | | | | | | | | | | | | | | | | | | | Example headers are discouraged in the API guidelines. Code just flows with the text. They may be good in places where there's a lot of stuff and structure may add clarity
| | * Revert "Fixed identation in actionmailer base_test"Xavier Noria2011-03-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Please excuse the revert. Albeit the commit is totally innocent, docrails has a strong no-code policy we need to enforce. Please feel free to submit the fix as a patch and assign it to me, I'll apply right away. This reverts commit d8462510c5378f9204778ffb9df4fdbece7dccd0.
| | * 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
| | | | | | | | | | | | This reverts commit 1d4826937e438ebcd6a2f9e29d2e466a43fef7a8.
| | * 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 ↵Rodrigo Navarro2011-02-271-1/+14
| | | | | | | | | | | | | | | | error_messages and error_messages_for view helpers.
| | * | 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 ↵Ben Orenstein2011-02-261-1/+1
| | | | | | | | | | | | | | | | readability for non-native english speakers.
| | * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | as different ruby implementations may have different values, for example Rubinius returns 53 for nil.id. [#6444 state:resolved]
| * | | Improve testing of cookies in functional tests:Andrew White2011-03-065-5/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - cookies can be set using string or symbol keys - cookies are preserved across calls to get, post, etc. - cookie names and values are escaped - cookies can be cleared using @request.cookies.clear [#6272 state:resolved]
| * | | Raise ArgumentError if route name is invalid [#6517 state:resolved]Andrew White2011-03-062-0/+34
| | | |
| * | | Allow model to be inherited from Hash [#6487 state:resolved]Alexander Uvarov2011-03-061-3/+4
| | | | | | | | | | | | | | | | Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
| * | | added failing test for fields_for with a record object that inherits from HashDiego Carrion2011-03-061-0/+19
| | | | | | | | | | | | | | | | Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>