Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3763 from qoobaa/orm-instance-fix | José Valim | 2011-11-26 | 1 | -1/+1 |
|\ | | | | | allow using orm_instance without invoking orm_class in generators | ||||
| * | allow using orm_instance without invoking orm_class first in generators | Jakub Kuźma | 2011-11-26 | 1 | -1/+1 |
| | | |||||
* | | add more tests for monday and sunday methods | Vijay Dev | 2011-11-26 | 1 | -0/+2 |
| | | |||||
* | | Merge pull request #3764 from arunagw/test_sunday_monday | Vijay Dev | 2011-11-26 | 1 | -0/+8 |
|\ \ | | | | | | | Tests added for monday and sunday | ||||
| * | | Tests added for monday and sunday | Arun Agrawal | 2011-11-26 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | Reference commits : a8f2860d0e7db86c61bb70935006100b04667ab1 80ac4dc6d0632937ccf61b38bc15fc2f6e27b18b | ||||
* | | | documenting monday and sunday methods | Vijay Dev | 2011-11-26 | 1 | -0/+11 |
|/ / | |||||
* | | Adds Time#sunday method | Vijay Dev | 2011-11-26 | 2 | -0/+7 |
| | | |||||
* | | Convert aliases monday and sunday to methods | Vijay Dev | 2011-11-26 | 3 | -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_week | Vijay Dev | 2011-11-26 | 1 | -2/+2 |
| | | |||||
* | | minor doc changes | Vijay Dev | 2011-11-26 | 2 | -4/+4 |
|/ | |||||
* | Merge pull request #3760 from arunagw/warning_removed_unused_var | José Valim | 2011-11-26 | 1 | -1/+1 |
|\ | | | | | Warning removed unused variable | ||||
| * | Warning removed unused variable | Arun Agrawal | 2011-11-26 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-11-26 | 9 | -20/+24 |
|\ | |||||
| * | rephrased ef38c3089e1269e2b315aff503e61c0b23c95f00 and | Vijay Dev | 2011-11-26 | 1 | -5/+1 |
| | | | | | | | | mentioned about OS X and windows usually having a JS runtime | ||||
| * | use any? to check for size | Vijay Dev | 2011-11-26 | 1 | -1/+1 |
| | | |||||
| * | what's -> that's | Uģis Ozols | 2011-11-25 | 1 | -1/+1 |
| | | |||||
| * | Remove unnecessary comment. | Uģis Ozols | 2011-11-25 | 1 | -1/+1 |
| | | |||||
| * | comma | rpq | 2011-11-23 | 1 | -1/+1 |
| | | |||||
| * | Move JS runtime instructions to where the error would be encountered, remove ↵ | Michael Pearson | 2011-11-24 | 1 | -12/+6 |
| | | | | | | | | gem install. | ||||
| * | Add step to getting_started to install JS Runtime. | Michael Pearson | 2011-11-24 | 1 | -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 Chung | 2011-11-22 | 1 | -1/+1 |
| | | | | | | - Handle scenario where @posts is empty. | ||||
| * | Revert "Added links to the 'Rails Initialization Guide', marked as a work in ↵ | Vijay Dev | 2011-11-22 | 2 | -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 Ross | 2011-11-21 | 1 | -1/+1 |
| | | |||||
| * | Minor grammar, typo & readability fixes for beginning of Rails ↵ | James Dean Shepherd | 2011-11-20 | 1 | -11/+11 |
| | | | | | | | | Initialization guide | ||||
| * | Added links to the 'Rails Initialization Guide', marked as a work in progress | James Dean Shepherd | 2011-11-20 | 2 | -0/+5 |
| | | |||||
| * | Small docs fix in Active Model callbacks module | Alexey Vakhov | 2011-11-19 | 1 | -1/+1 |
| | | |||||
| * | Some fixes on RELEASING_RAILS.rdoc. | Hendy Tanata | 2011-11-18 | 1 | -3/+3 |
| | | |||||
| * | Add config.active_record.identity_map to the configuration guide. | Matt Burke | 2011-11-18 | 1 | -0/+2 |
| | | |||||
* | | removes a Serialization constant left in the previous revert | Xavier Noria | 2011-11-25 | 1 | -1/+0 |
| | | |||||
* | | finders guide: adds some pointers to help users interpret the output of EXPLAIN | Xavier Noria | 2011-11-25 | 1 | -0/+11 |
| | | |||||
* | | add the query to AR::Relation#explain output | Xavier Noria | 2011-11-25 | 5 | -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 Noria | 2011-11-25 | 3 | -8/+18 |
| | | |||||
* | | API docstrings updated with default value info | gregolsen | 2011-11-25 | 2 | -6/+6 |
| | | |||||
* | | beginning_of_week extended in both Time and Date so that to return week ↵ | gregolsen | 2011-11-25 | 5 | -20/+76 |
| | | | | | | | | start based on start day that is monday by default | ||||
* | | Revert the serializers API as other alternatives are now also under discussion | José Valim | 2011-11-25 | 18 | -1268/+1 |
| | | |||||
* | | Merge pull request #3756 from ↵ | José Valim | 2011-11-25 | 2 | -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 Donahue | 2011-11-25 | 2 | -7/+10 |
|/ / | | | | | | | test for b/eol on inserts | ||||
* | | Merge pull request #3747 from lest/middleware-logger | José Valim | 2011-11-25 | 8 | -32/+37 |
|\ \ | | | | | | | middlewares should have configurable logger | ||||
| * | | middlewares should use logger from env | lest | 2011-11-25 | 8 | -32/+37 |
| | | | |||||
* | | | I suck, forgot to also change rake's task description | Piotr Sarnacki | 2011-11-25 | 1 | -1/+1 |
| | | | |||||
* | | | Display mounted engines in `rake routes` by default | Piotr Sarnacki | 2011-11-25 | 3 | -6/+2 |
| | | | |||||
* | | | Merge branch 'serializers' | José Valim | 2011-11-25 | 35 | -482/+2074 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements the ActiveModel::Serializer object. Includes code, tests, generators and guides. From José and Yehuda with love. Conflicts: railties/CHANGELOG.md | ||||
| * | | | Add docs to serializers. Update CHANGELOGs. | José Valim | 2011-11-25 | 4 | -13/+114 |
| | | | | |||||
| * | | | Add a hook for serializers in the scaffold generator (off for now). | José Valim | 2011-11-25 | 3 | -1/+13 |
| | | | | |||||
| * | | | Add generators for serializers. | José Valim | 2011-11-25 | 6 | -0/+142 |
| | | | | |||||
| * | | | Rename UserSerializer to DefaultUserSerializer in tests. | José Valim | 2011-11-23 | 1 | -15/+13 |
| | | | | |||||
| * | | | Rely solely on active_model_serializer and remove the fancy constant lookup. | José Valim | 2011-11-23 | 7 | -79/+41 |
| | | | | |||||
| * | | | Remove listings from the serialization guide that won't make 3.2. | José Valim | 2011-11-23 | 1 | -37/+0 |
| | | | | |||||
| * | | | Implement ArraySerializer and move old serialization API to a new namespace. | José Valim | 2011-11-23 | 15 | -436/+610 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following constants were renamed: ActiveModel::Serialization => ActiveModel::Serializable ActiveModel::Serializers::JSON => ActiveModel::Serializable::JSON ActiveModel::Serializers::Xml => ActiveModel::Serializable::XML The main motivation for such a change is that `ActiveModel::Serializers::JSON` was not actually a serializer, but a module that when included allows the target to be serializable to JSON. With such changes, we were able to clean up the namespace to add true serializers as the ArraySerializer. | ||||
| * | | | Add safe_constantize to ActiveSupport::Dependencies. | José Valim | 2011-11-23 | 2 | -28/+43 |
| | | | |