aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* nested attributes tests should rely on associated objects to verify results n...Subba Rao Pasupuleti2010-09-011-57/+64
* Use join instead of looping and calling to_s [#5492 state:resolved]Thiago Pradi2010-09-011-3/+1
* Bump rack-mount to 0.6.13 and add test case for named character classes [#550...Andrew White2010-08-312-1/+13
* Merge remote branch 'docrails/master'Xavier Noria2010-09-014-57/+52
|\
| * Fix benchmarking for rails3Damien Mathieu2010-08-311-6/+6
| * Fix API docs for button_to optionsJaime Iniesta2010-08-311-2/+3
| * Corrected typo in example on rendering collections in partials changing @post...Michael MacDonald2010-08-311-1/+1
| * Fix an english failPratik Naik2010-08-311-1/+1
| * Fix the readonly sectionPratik Naik2010-08-311-11/+5
| * Update the section about joinsPratik Naik2010-08-311-4/+4
| * Fix pessimistic locking examplesPratik Naik2010-08-301-4/+4
| * Reword calculations sectionPratik Naik2010-08-301-10/+10
| * Reword the section about exists?Pratik Naik2010-08-301-3/+3
| * Improve example for having()Pratik Naik2010-08-301-1/+1
| * Remove {} from hash conditions. And more occurrences of [] in array conditionsPratik Naik2010-08-301-12/+12
| * Array conditions dont need []Pratik Naik2010-08-301-3/+3
* | Make all the Relation finder methods consistentPratik Naik2010-08-311-32/+67
* | Merge remote branch 'miloops/rails_master_fixes'Pratik Naik2010-08-311-15/+26
|\ \
| * | Avoid calling build_where is no argument is given.Emilio Tagua2010-08-311-1/+1
| * | Improved conditionals usage to prevent calling methods.Emilio Tagua2010-08-311-8/+19
| * | Don't test conditional in iteration if it is not present just clone it.Emilio Tagua2010-08-311-9/+9
* | | Remove default values for Relation#limit/offset/from/create_withPratik Naik2010-08-311-4/+4
* | | Change relation merging to always append select, group and order valuesPratik Naik2010-08-315-55/+28
|/ /
* | If certain sections of skip_callback method are commented out thenNeeraj Singh2010-08-311-0/+27
* | replacing superclass_delegating_accessor with class_attributeNeeraj Singh2010-08-311-6/+6
* | Replacing superclass_delegating_accessoror with class_attribute.Neeraj Singh2010-08-311-1/+1
* | Replacing superclass_delegating_accessoror with class_attribute.Neeraj Singh2010-08-311-1/+1
* | adding new test for ActiveModel::SerializationNeeraj Singh2010-08-311-0/+45
* | Bring back build to the initialization guideSantiago Pastorino2010-08-311-2/+2
* | Speed up form_for by specializing extract_options! (at asakusa.rb)wycats2010-08-311-6/+8
* | Speed up content_tag_for by simplifying needed logicwycats2010-08-311-3/+3
|/
* resolves merge conflictXavier Noria2010-08-3115-81/+275
|\
| * User.each is a liePratik Naik2010-08-301-2/+2
| * Remove mention of InstantRails, it is completely obsolete.Joost Baaij2010-08-301-1/+1
| * Merge branch 'master' of github.com:lifo/docrailsJoost Baaij2010-08-302-2/+2
| |\
| | * Revert "refer to guides since 3.0 is released now"Xavier Noria2010-08-301-1/+1
| | * Revert "Revert "refer to guides since 3.0 is released now""Xavier Noria2010-08-301-1/+1
| * | Merge branch 'master' of github.com:lifo/docrailsJoost Baaij2010-08-301-1/+1
| |\|
| | * Revert "refer to guides since 3.0 is released now"Xavier Noria2010-08-301-1/+1
| * | Remove beta and RC paths in documentationJoost Baaij2010-08-303-31/+26
| |/
| * refer to guides since 3.0 is released nowJoost Baaij2010-08-301-1/+1
| * refer to guides since 3.0 is released nowJoost Baaij2010-08-301-1/+1
| * fix the cache_fu linksDamien Mathieu2010-08-301-1/+1
| * Update README to match Rails 3 generated directory structureBryan Helmkamp2010-08-301-1/+1
| * The command for creating the sessions table has changedAkira Matsuda2010-08-301-1/+1
| * Expanded routing documentation with current best practicesJoost Baaij2010-08-295-21/+188
| * Rework the routing documentation.Joost Baaij2010-08-281-22/+75
| * The call-seq directive has no useful effect on our documentation and is not u...Joost Baaij2010-08-282-22/+0
* | Merge josevalim/deprecations branch.José Valim2010-08-3017-146/+259
|\ \
| * | let String#strip_heredoc handle blank lines even if they are not indentedXavier Noria2010-08-302-3/+14