Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | avoid absolute path for the rails.png in index.html | kennyj | 2011-11-27 | 2 | -1/+2 | |
|/ / / | ||||||
* | | | Merge pull request #3765 from qoobaa/orm-instance-fix | José Valim | 2011-11-26 | 2 | -1/+39 | |
|\ \ \ | | | | | | | | | added tests to #3763 | |||||
| * | | | added tests, replaced classify with constantize - using classify here cuts ↵ | Jakub Kuźma | 2011-11-26 | 2 | -1/+39 | |
| | | | | | | | | | | | | | | | | the last 's' in ORM name | |||||
* | | | | 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 | |
| | |/ | |/| | ||||||
* | | | documenting monday and sunday methods | Vijay Dev | 2011-11-26 | 1 | -0/+11 | |
| | | | ||||||
* | | | Adds Time#sunday method | Vijay Dev | 2011-11-26 | 1 | -0/+1 | |
| | | | ||||||
* | | | Convert aliases monday and sunday to methods | Vijay Dev | 2011-11-26 | 1 | -3/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-11-26 | 4 | -12/+16 | |
|\ \ | ||||||
| * | | rephrased ef38c3089e1269e2b315aff503e61c0b23c95f00 and | Vijay Dev | 2011-11-26 | 1 | -5/+1 | |
| | | | | | | | | | | | | mentioned about OS X and windows usually having a JS runtime | |||||
| * | | 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. | |||||
| * | | 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. | |||||
| * | | 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 | |
| | | | ||||||
| * | | Add config.active_record.identity_map to the configuration guide. | Matt Burke | 2011-11-18 | 1 | -0/+2 | |
| | | | ||||||
* | | | 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 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+3 | |
| | | | ||||||
* | | | beginning_of_week extended in both Time and Date so that to return week ↵ | gregolsen | 2011-11-25 | 1 | -4/+6 | |
| | | | | | | | | | | | | 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 | 11 | -720/+1 | |
| | | | ||||||
* | | | 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 | 2 | -1/+3 | |
|\ \ \ | | | | | | | | | middlewares should have configurable logger | |||||
| * | | | middlewares should use logger from env | lest | 2011-11-25 | 2 | -1/+3 | |
| | | | | ||||||
* | | | | 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 | 11 | -8/+727 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -5/+7 | |
| | | | | | ||||||
| * | | | | 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 | |
| | | | | | ||||||
| * | | | | Remove listings from the serialization guide that won't make 3.2. | José Valim | 2011-11-23 | 1 | -37/+0 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into serializers | José Valim | 2011-11-23 | 79 | -2958/+3456 | |
| |\ \ \ \ | ||||||
| * | | | | | minor edits in serializers guide | Vijay Dev | 2011-10-15 | 1 | -9/+9 | |
| | | | | | | ||||||
| * | | | | | Initial commit of serializer support | Jose and Yehuda | 2011-10-15 | 1 | -0/+600 | |
| | | | | | | ||||||
* | | | | | | Added tests for #3751 | ganesh | 2011-11-25 | 2 | -2/+2 | |
| |_|/ / / |/| | | | | ||||||
* | | | | | Allow to display engine's routes when running `rake routes ENGINES=true` | Piotr Sarnacki | 2011-11-24 | 4 | -6/+70 | |
| | | | | | ||||||
* | | | | | Forgot to add CHANGELOG entry for config.railties_order | Piotr Sarnacki | 2011-11-24 | 1 | -0/+4 | |
| | | | | | ||||||
* | | | | | Merge pull request #3739 from lest/config-always-write-cookie | José Valim | 2011-11-23 | 1 | -0/+47 | |
|\ \ \ \ \ | | | | | | | | | | | | | configuration option to always write cookie | |||||
| * | | | | | configuration option to always write cookie | lest | 2011-11-23 | 1 | -0/+47 | |
| | | | | | | ||||||
* | | | | | | Allow to change engine's loading priority with config.railties_order= | Piotr Sarnacki | 2011-11-23 | 4 | -4/+173 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #3731 from HeeL/master | Yehuda Katz | 2011-11-23 | 1 | -3/+14 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | code stats calculation | |||||
| * | | | | improved code stats calculation, check on multiline comments and rewrite ↵ | Sergey Parizhskiy | 2011-11-23 | 1 | -3/+14 | |
| | | | | | | | | | | | | | | | | | | | | regexps according to a class naming convention | |||||
* | | | | | Rely on a public contract between railties instead of accessing railtie ↵ | José Valim | 2011-11-23 | 4 | -21/+34 | |
|/ / / / | | | | | | | | | | | | | methods directly. | |||||
* | | | | Merge pull request #3724 from marcandre/media_default | Yehuda Katz | 2011-11-22 | 3 | -3/+3 | |
|\ \ \ \ | | | | | | | | | | | stylesheet_tag default's media is "screen" | |||||
| * | | | | Make explicit the default media when calling stylesheet_tag and change the ↵ | Marc-Andre Lafortune | 2011-11-22 | 3 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | default generators. | |||||
* | | | | | add ActionController::Metal#show_detailed_exceptions? | lest | 2011-11-22 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Remove the -h option to dbconsole which is the shorter form of --header | Vijay Dev | 2011-11-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done since the -h option to dbconsole hides the conventional -h for help and forces users to use --help to see the usage options for dbconsole. |