aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | Merge pull request #3769 from kennyj/fix_index_htmlJosé Valim2011-11-272-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | avoid url started with "/" for the rails.png in public/index.html
| * | | | | | | | | | | | | | | | | avoid absolute path for the rails.png in index.htmlkennyj2011-11-272-1/+2
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #3772 from lest/label-with-blockJosé Valim2011-11-273-2/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | fix label with block in erb
| * | | | | | | | | | | | | | | | fix label with block in erblest2011-11-273-2/+13
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #3767 from tadast/object_inYehuda Katz2011-11-262-7/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | Object#in? also accepts multiple parameters
| * | | | | | | | | | | | | | | Object#in? also accepts multiple parametersTadas Tamošauskas2011-11-262-7/+27
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #3765 from qoobaa/orm-instance-fixJosé Valim2011-11-262-1/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added tests to #3763
| * | | | | | | | | | | | | | | | added tests, replaced classify with constantize - using classify here cuts ↵Jakub Kuźma2011-11-262-1/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the last 's' in ORM name
* | | | | | | | | | | | | | | | | Merge pull request #3763 from qoobaa/orm-instance-fixJosé Valim2011-11-261-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow using orm_instance without invoking orm_class in generators
| * | | | | | | | | | | | | | | | allow using orm_instance without invoking orm_class first in generatorsJakub Kuźma2011-11-261-1/+1
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | add more tests for monday and sunday methodsVijay Dev2011-11-261-0/+2
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #3764 from arunagw/test_sunday_mondayVijay Dev2011-11-261-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests added for monday and sunday
| * | | | | | | | | | | | | | | | | Tests added for monday and sunday Arun Agrawal2011-11-261-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reference commits : a8f2860d0e7db86c61bb70935006100b04667ab1 80ac4dc6d0632937ccf61b38bc15fc2f6e27b18b
* | | | | | | | | | | | | | | | | | documenting monday and sunday methodsVijay Dev2011-11-261-0/+11
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Adds Time#sunday methodVijay Dev2011-11-262-0/+7
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Convert aliases monday and sunday to methodsVijay Dev2011-11-263-6/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A recent change to beginning_of_week and end_of_week added an argument that can be used to specify the week's starting day as a symbol. Now these methods were aliased as monday and sunday respectively which as a consequence of the argument addition, made calls like obj.monday(:sunday) possible. This commit makes them methods on their own.
* | | | | | | | | | | | | | | | | 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 variable
| * | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mentioned about OS X and windows usually having a JS runtime
| * | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gem install.
| * | | | | | | | | | | | | | | Add step to getting_started to install JS Runtime.Michael Pearson2011-11-241-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | abstrakt on #rubyonrails found that the guide, when followed step by step, does fails at the 'rails server' command due to a lacking JS runtime.
| * | | | | | | | | | | | | | | - Avoid using .first since it will create an additional query. Marc Chung2011-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Handle scenario where @posts is empty.
| * | | | | | | | | | | | | | | Revert "Added links to the 'Rails Initialization Guide', marked as a work in ↵Vijay Dev2011-11-222-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | progress" This reverts commit 6b4939c3fd22924ee3d906f08fe739d848f80a3d. Reason: This guide is still incomplete and is not yet reviewed or ready to go to the index.
| * | | | | | | | | | | | | | | 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 ↵James Dean Shepherd2011-11-201-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialization guide
| * | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rationale: this is more readable if serveral queries are involved in one call. Also, it will be possible to let AR log EXPLAINs automatically in production mode, where queries are not even around.
* | | | | | | | | | | | | | | | 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 ↵gregolsen2011-11-255-20/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | start based on start day that is monday by default
* | | | | | | | | | | | | | | | Revert the serializers API as other alternatives are now also under discussionJosé Valim2011-11-2518-1268/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #3756 from ↵José Valim2011-11-252-7/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | johnmdonahue/update-gem-action-linebreaks-and-indentation Updating newline fix to maintain existing linebreaks and indentation and...
| * | | | | | | | | | | | | | | | Updating newline fix to maintain existing linebreaks and indentation and ↵John Donahue2011-11-252-7/+10
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test for b/eol on inserts
* | | | | | | | | | | | | | | | Merge pull request #3747 from lest/middleware-loggerJosé Valim2011-11-258-32/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | middlewares should have configurable logger
| * | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements the ActiveModel::Serializer object. Includes code, tests, generators and guides. From José and Yehuda with love. Conflicts: railties/CHANGELOG.md
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-17 05:58:58 +0000