aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Convert aliases monday and sunday to methodsVijay Dev2011-11-263-6/+24
* s/end_on_week/end_of_weekVijay Dev2011-11-261-2/+2
* minor doc changesVijay Dev2011-11-262-4/+4
* Merge pull request #3760 from arunagw/warning_removed_unused_varJosé Valim2011-11-261-1/+1
|\
| * Warning removed unused variableArun Agrawal2011-11-261-1/+1
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-269-20/+24
|\
| * rephrased ef38c3089e1269e2b315aff503e61c0b23c95f00 andVijay Dev2011-11-261-5/+1
| * use any? to check for sizeVijay Dev2011-11-261-1/+1
| * what's -> that'sUģis Ozols2011-11-251-1/+1
| * Remove unnecessary comment.Uģis Ozols2011-11-251-1/+1
| * commarpq2011-11-231-1/+1
| * Move JS runtime instructions to where the error would be encountered, remove ...Michael Pearson2011-11-241-12/+6
| * Add step to getting_started to install JS Runtime.Michael Pearson2011-11-241-0/+12
| * - Avoid using .first since it will create an additional query. Marc Chung2011-11-221-1/+1
| * Revert "Added links to the 'Rails Initialization Guide', marked as a work in ...Vijay Dev2011-11-222-5/+0
| * Fix missing single quote that was messing up syntax highlighting.Robert Ross2011-11-211-1/+1
| * Minor grammar, typo & readability fixes for beginning of Rails Initialization...James Dean Shepherd2011-11-201-11/+11
| * Added links to the 'Rails Initialization Guide', marked as a work in progressJames Dean Shepherd2011-11-202-0/+5
| * Small docs fix in Active Model callbacks moduleAlexey Vakhov2011-11-191-1/+1
| * Some fixes on RELEASING_RAILS.rdoc.Hendy Tanata2011-11-181-3/+3
| * Add config.active_record.identity_map to the configuration guide.Matt Burke2011-11-181-0/+2
* | removes a Serialization constant left in the previous revertXavier Noria2011-11-251-1/+0
* | finders guide: adds some pointers to help users interpret the output of EXPLAINXavier Noria2011-11-251-0/+11
* | add the query to AR::Relation#explain outputXavier Noria2011-11-255-2/+17
* | some tweaks to PR#3547. [Closes #3547]Xavier Noria2011-11-253-8/+18
* | API docstrings updated with default value infogregolsen2011-11-252-6/+6
* | beginning_of_week extended in both Time and Date so that to return week start...gregolsen2011-11-255-20/+76
* | Revert the serializers API as other alternatives are now also under discussionJosé Valim2011-11-2518-1268/+1
* | Merge pull request #3756 from johnmdonahue/update-gem-action-linebreaks-and-i...José Valim2011-11-252-7/+10
|\ \
| * | Updating newline fix to maintain existing linebreaks and indentation and test...John Donahue2011-11-252-7/+10
|/ /
* | Merge pull request #3747 from lest/middleware-loggerJosé Valim2011-11-258-32/+37
|\ \
| * | middlewares should use logger from envlest2011-11-258-32/+37
* | | I suck, forgot to also change rake's task descriptionPiotr Sarnacki2011-11-251-1/+1
* | | Display mounted engines in `rake routes` by defaultPiotr Sarnacki2011-11-253-6/+2
* | | Merge branch 'serializers'José Valim2011-11-2535-482/+2074
|\ \ \
| * | | Add docs to serializers. Update CHANGELOGs.José Valim2011-11-254-13/+114
| * | | Add a hook for serializers in the scaffold generator (off for now).José Valim2011-11-253-1/+13
| * | | Add generators for serializers.José Valim2011-11-256-0/+142
| * | | Rename UserSerializer to DefaultUserSerializer in tests.José Valim2011-11-231-15/+13
| * | | Rely solely on active_model_serializer and remove the fancy constant lookup.José Valim2011-11-237-79/+41
| * | | Remove listings from the serialization guide that won't make 3.2.José Valim2011-11-231-37/+0
| * | | Implement ArraySerializer and move old serialization API to a new namespace.José Valim2011-11-2315-436/+610
| * | | Add safe_constantize to ActiveSupport::Dependencies.José Valim2011-11-232-28/+43
| * | | Merge branch 'master' into serializersJosé Valim2011-11-23282-19051/+21651
| |\ \ \
| * | | | Remove 1.9 Hash syntax - tests passing on 1.8.7Jose and Yehuda2011-10-151-3/+3
| * | | | Add initial support for embed APIJose and Yehuda2011-10-152-7/+101
| * | | | Add support for the root attributeJose and Yehuda2011-10-152-15/+74
| * | | | Fix nil has_one associationJose and Yehuda2011-10-152-2/+20
| * | | | Add association_idsJose and Yehuda2011-10-152-2/+89
| * | | | Add support for overriding associations, mostly used for authorizationJose and Yehuda2011-10-152-1/+31