Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #3756 from johnmdonahue/update-gem-action-linebreaks-and-i... | José Valim | 2011-11-25 | 2 | -7/+10 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Updating newline fix to maintain existing linebreaks and indentation and test... | John Donahue | 2011-11-25 | 2 | -7/+10 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #3747 from lest/middleware-logger | José Valim | 2011-11-25 | 8 | -32/+37 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | 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 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | 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 | |
| * | | | | | | Add safe_constantize to ActiveSupport::Dependencies. | José Valim | 2011-11-23 | 2 | -28/+43 | |
| * | | | | | | Merge branch 'master' into serializers | José Valim | 2011-11-23 | 282 | -19051/+21651 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | Remove 1.9 Hash syntax - tests passing on 1.8.7 | Jose and Yehuda | 2011-10-15 | 1 | -3/+3 | |
| * | | | | | | | Add initial support for embed API | Jose and Yehuda | 2011-10-15 | 2 | -7/+101 | |
| * | | | | | | | Add support for the root attribute | Jose and Yehuda | 2011-10-15 | 2 | -15/+74 | |
| * | | | | | | | Fix nil has_one association | Jose and Yehuda | 2011-10-15 | 2 | -2/+20 | |
| * | | | | | | | Add association_ids | Jose and Yehuda | 2011-10-15 | 2 | -2/+89 | |
| * | | | | | | | Add support for overriding associations, mostly used for authorization | Jose and Yehuda | 2011-10-15 | 2 | -1/+31 | |
| * | | | | | | | Add support for implicit serializers | Jose and Yehuda | 2011-10-15 | 2 | -26/+72 | |
| * | | | | | | | Added has_one and has_many | Jose and Yehuda | 2011-10-15 | 2 | -14/+123 | |
| * | | | | | | | Don't unnecessarily use String eval. | Jose and Yehuda | 2011-10-15 | 1 | -2/+2 | |
| * | | | | | | | Don't require serializable_hash to take options. | Jose and Yehuda | 2011-10-15 | 2 | -3/+3 | |
| * | | | | | | | minor edits in serializers guide | Vijay Dev | 2011-10-15 | 1 | -9/+9 | |
| * | | | | | | | Initial implementation of ActiveModel::Serializer | Jose and Yehuda | 2011-10-15 | 3 | -0/+122 | |
| * | | | | | | | Refactor to make renderers a Set | Jose and Yehuda | 2011-10-15 | 1 | -11/+9 | |
| * | | | | | | | Initial commit of serializer support | Jose and Yehuda | 2011-10-15 | 5 | -0/+662 | |
* | | | | | | | | Merge pull request #3752 from ganeshkumar/gem_lending | José Valim | 2011-11-25 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | 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 | |
* | | | | | | | Merge pull request #3746 from qoobaa/active-model-naming-with-anonymous-classes | Piotr Sarnacki | 2011-11-24 | 2 | -0/+16 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | make ActiveModel::Name fail gracefully with anonymous classes | Jakub Kuźma | 2011-11-24 | 2 | -0/+16 | |
|/ / / / / / / | ||||||
* | | | | | | | 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 | 4 | -4/+56 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | configuration option to always write cookie | lest | 2011-11-23 | 4 | -4/+56 | |
* | | | | | | | | 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 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | improved code stats calculation, check on multiline comments and rewrite rege... | Sergey Parizhskiy | 2011-11-23 | 1 | -3/+14 | |
* | | | | | | | | Merge pull request #3733 from kennyj/fix_warnings_for_show_exceptions_test | Yehuda Katz | 2011-11-23 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Warnings removed. (ambiguous first argument) | kennyj | 2011-11-24 | 1 | -3/+3 | |
| |/ / / / / / | ||||||
* | | | | | | | Rely on a public contract between railties instead of accessing railtie metho... | José Valim | 2011-11-23 | 12 | -54/+94 | |
* | | | | | | | Optimize cache expansion by skipping rails cache id in nested keys. | José Valim | 2011-11-23 | 2 | -58/+64 | |
* | | | | | | | Merge pull request #3738 from exviva/issues/3737_AS_cache_expand_cache_key | José Valim | 2011-11-23 | 2 | -13/+26 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix #3737 AS::expand_cache_key generates wrong key in certain situations (par... | Olek Janiszewski | 2011-11-23 | 2 | -3/+14 | |
| * | | | | | | | Fix #3737 AS::expand_cache_key generates wrong key in certain situations | Olek Janiszewski | 2011-11-23 | 2 | -12/+14 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #3735 from kennyj/fix_3728 | José Valim | 2011-11-23 | 3 | -6/+25 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Remove unreachable code, and add additional testcases. | kennyj | 2011-11-24 | 3 | -6/+25 | |
|/ / / / / / |