aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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
| | | | | | | | | | | | | | no test was failing. Tests have been added to ensure that commenting out the code within if loop would cause test failure. Signed-off-by: José Valim <jose.valim@gmail.com>
* | replacing superclass_delegating_accessor with class_attributeNeeraj Singh2010-08-311-6/+6
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | Replacing superclass_delegating_accessoror with class_attribute.Neeraj Singh2010-08-311-1/+1
| | | | | | | | | | | | | | :store_full_sti_class will have value true or false so there is no danger of mutability here. Signed-off-by: José Valim <jose.valim@gmail.com>
* | Replacing superclass_delegating_accessoror with class_attribute.Neeraj Singh2010-08-311-1/+1
| | | | | | | | | | | | | | :partial_attributes will have value true or false so there is no danger of mutability here. Signed-off-by: José Valim <jose.valim@gmail.com>
* | adding new test for ActiveModel::SerializationNeeraj Singh2010-08-311-0/+45
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | 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
| | | | | | | | Mention RubyInstaller instead which is actually quite pleasant and runs Rails fine.
| * 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
| | | | | | | | | | | | | | | | | | Reason: This is an exception. Thing is when you contribute to Rails you need to know how to proceed *now*, the instructions may be different than the ones published with some past release. This reverts commit d1b239da4ceebb429246db3d09cfa05a910bc895.
| | * Revert "Revert "refer to guides since 3.0 is released now""Xavier Noria2010-08-301-1/+1
| | | | | | | | | | | | | | | | | | Wanted to revert a different commit with same message This reverts commit 15d07981f6617a3f97f9e36f257131b56a97a441.
| * | 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
| | | | | | | | | | | | | | | | | | Reason: This is an exception. Thing is when you contribute to Rails you need to know how to proceed *now*, the instructions may be different than the ones published with some past release. This reverts commit 3d13dc88e20f86ac294baeafdd8343c5ddd3b623.
| * | 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
| | | | | | | | | | Move the default route to the bottom, as this practise should be discouraged. Add documentation for resources, external redirects and Rack applications.
| * The call-seq directive has no useful effect on our documentation and is not ↵Joost Baaij2010-08-282-22/+0
| | | | | | | | | | | | | | | | | | | | | | used anywhere else. Worse still, its use breaks some rdoc, replacing method names with a curly brace. Having just one call-seq directive doesn't add anything since this is covered by regular rdoc. Having multiple might make sense, but these are already documented with examples. This partly re-reverts 60de0e56b7f57f0052d7e4f43bd2ef9e363c6a1a but does not touch the vendorized code in html-scanner.
* | Merge josevalim/deprecations branch.José Valim2010-08-3017-146/+259
|\ \ | | | | | | | | | I maintained on purpose the DeprecatedUrlOptions in ActionMailer and the Deprecated configuration in Railties because they were already addressed by Piotr in his RSoC work.
| * | let String#strip_heredoc handle blank lines even if they are not indentedXavier Noria2010-08-302-3/+14
| | |
| * | Adding option to ActiveResource to allow you to not reset the previously ↵Mikel Lindsaar2010-08-292-3/+79
| | | | | | | | | | | | stored requests and responses by passing false to respond_to
| * | Updating documentation on ActiveResource HTTP Mock and also adding test coverageMikel Lindsaar2010-08-292-3/+65
| | |
| * | Update CHANGELOGs for 3.0 release and upcoming 3.1Jeremy Kemper2010-08-298-140/+26
| | |
| * | Bump arel to 1.0.1Jeremy Kemper2010-08-291-1/+1
| | |
| * | Add .yardopts so YARD can document RailsLoren Segal2010-08-301-0/+3
| | |
| * | implements String#strip_heredocXavier Noria2010-08-295-1/+76
| | |
| * | revises a deprecation messageXavier Noria2010-08-291-2/+2
| | |
| * | -v=1.0.0 not neededSantiago Pastorino2010-08-291-1/+1
| | |