aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'rails/master'Xavier Noria2010-07-22146-1234/+1275
|\
| * camelize and underscore are sort of inverse of each other, but not in a mathe...Xavier Noria2010-07-222-2/+16
| * routing guide: say "path" when you mean pathXavier Noria2010-07-221-36/+36
| * routing guide: a "photo" resource has by convention paths under "photos", in ...Xavier Noria2010-07-221-6/+6
| * doc: form_for does return output rather than merely evaluate its blockWincent Colaiuta2010-07-221-4/+0
| * Mention that ActionMailer::Base.default_url_options is now deprecatedJeroen van Dijk2010-07-221-5/+4
| * non-singleton true and false should go on regular fontJaime Iniesta2010-07-221-1/+1
| * Active Record Validations and Callbacks guide: Fixed typos and rephrased some...Jaime Iniesta2010-07-221-11/+12
| * expanded comment for update_attribute methodNeeraj Singh2010-07-221-2/+9
| * correct typos in Routing examplesMislav Marohnić2010-07-221-3/+3
| * replacing around with for in the comments for callbacksNeeraj Singh2010-07-221-1/+1
| * Test Hash#to_param escapes keys and valuesSantiago Pastorino2010-07-221-0/+4
| * Hash#to_param is doesn't use sort anymore, some tests added for Hash#to_paramSantiago Pastorino2010-07-222-1/+26
| * removing unused models from testsSubba Rao Pasupuleti2010-07-2114-43/+1
| * Fixed a globbed route issue where slashes were being escaped, causing assert_...Brian Rose2010-07-212-1/+9
| * Change some missing README -> README.rdocSantiago Pastorino2010-07-228-19/+19
| * remote_function patch with more detailed testAndrew Kaspick2010-07-212-1/+7
| * Make use of tap to return a previously used varSantiago Pastorino2010-07-211-4/+4
| * Make config.generators accept string namespaces, you can do now config.genera...Santiago Pastorino2010-07-212-0/+16
| * We are doing the same in this conditionsSantiago Pastorino2010-07-211-3/+1
| * renaming tests by removing proxy_options from namesNeeraj Singh2010-07-211-5/+5
| * Use capture instead of yield in link_to_unless.José Valim2010-07-211-1/+1
| * Ensure insert_before in middleware stack raises a meaningful error message [#...José Valim2010-07-212-4/+21
| * Ensure default_scope can be overwriten by association conditions.José Valim2010-07-212-0/+6
| * eagerly loaded association records should respect default_scope [#2931 state:...Subba Rao Pasupuleti2010-07-214-3/+23
| * update_attribute should not update readonly attributesNeeraj Singh2010-07-215-2/+15
| * rake db:seed should check if the database have pending migrations [#5163 stat...Thiago Pradi2010-07-211-1/+1
| * Ensure all join table attributes will be in the same timestamp.José Valim2010-07-211-11/+21
| * Timestamp columns of HABTM join table should record timestampsNeeraj Singh2010-07-214-5/+57
| * Revert "save on parent should not cascade to child unless child changed [#335...José Valim2010-07-212-21/+1
| * Strengthening the test for nested_attributeSubba Rao Pasupuleti2010-07-211-1/+20
| * association load target shouldn't replace recordsSzetobo2010-07-212-4/+17
| * In nested_attributes when association is not loaded and associationSubba Rao Pasupuleti2010-07-212-1/+14
| * - without the id test is passing even if I change :allow_destroy from 'false'...Neeraj Singh2010-07-211-2/+47
| * Fix failing railties tests.José Valim2010-07-211-0/+3
| * Reuse already existing classes for ActiveModel tests.José Valim2010-07-214-63/+44
| * Add .rdoc extension to README files.José Valim2010-07-2116-15/+15
| * Rework a bit README files.José Valim2010-07-214-284/+70
| * Improve contribuition guide.José Valim2010-07-211-15/+42
| * Remove old install.rb files.José Valim2010-07-218-182/+13
| * No need to delegate. Simply include the whole RecordIdentifier module.José Valim2010-07-217-25/+10
| * Moved a few methods from RecordIdentifier to ActiveModel::NamingPiotr Sarnacki2010-07-216-78/+101
| * id is a public methodSantiago Pastorino2010-07-211-2/+2
| * Ensure that primary_keys of HABTM records is not double quotedNeeraj Singh2010-07-205-2/+47
| * Moved PolymorphicRoutes to ActionDispatch::RoutingPiotr Sarnacki2010-07-208-189/+191
| * Make use of severity levelsSantiago Pastorino2010-07-201-2/+3
| * This example is better for guides and gem/plugins docsSantiago Pastorino2010-07-201-7/+0
| * Fix a failing test in Railtie and properly define all severity levels in Mock...José Valim2010-07-203-22/+21
| * adding a reader for loaded, initializing @loaded to falseAaron Patterson2010-07-202-7/+4
| * Add a test for elapsed and require missing benchmark file.José Valim2010-07-203-19/+16