aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | 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
| * | | | | Add support for implicit serializersJose and Yehuda2011-10-152-26/+72
| * | | | | Added has_one and has_manyJose and Yehuda2011-10-152-14/+123
| * | | | | Don't unnecessarily use String eval.Jose and Yehuda2011-10-151-2/+2
| * | | | | Don't require serializable_hash to take options.Jose and Yehuda2011-10-152-3/+3
| * | | | | minor edits in serializers guideVijay Dev2011-10-151-9/+9
| * | | | | Initial implementation of ActiveModel::SerializerJose and Yehuda2011-10-153-0/+122
| * | | | | Refactor to make renderers a SetJose and Yehuda2011-10-151-11/+9
| * | | | | Initial commit of serializer supportJose and Yehuda2011-10-155-0/+662
* | | | | | Merge pull request #3752 from ganeshkumar/gem_lendingJosé Valim2011-11-252-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Added tests for #3751ganesh2011-11-252-2/+2
|/ / / / /
* | | | | Allow to display engine's routes when running `rake routes ENGINES=true`Piotr Sarnacki2011-11-244-6/+70
* | | | | Merge pull request #3746 from qoobaa/active-model-naming-with-anonymous-classesPiotr Sarnacki2011-11-242-0/+16
|\ \ \ \ \
| * | | | | make ActiveModel::Name fail gracefully with anonymous classesJakub Kuźma2011-11-242-0/+16
|/ / / / /
* | | | | Forgot to add CHANGELOG entry for config.railties_orderPiotr Sarnacki2011-11-241-0/+4
* | | | | Merge pull request #3739 from lest/config-always-write-cookieJosé Valim2011-11-234-4/+56
|\ \ \ \ \
| * | | | | configuration option to always write cookielest2011-11-234-4/+56
* | | | | | Allow to change engine's loading priority with config.railties_order=Piotr Sarnacki2011-11-234-4/+173
|/ / / / /
* | | | | Merge pull request #3731 from HeeL/masterYehuda Katz2011-11-231-3/+14
|\ \ \ \ \
| * | | | | improved code stats calculation, check on multiline comments and rewrite rege...Sergey Parizhskiy2011-11-231-3/+14
* | | | | | Merge pull request #3733 from kennyj/fix_warnings_for_show_exceptions_testYehuda Katz2011-11-231-3/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Warnings removed. (ambiguous first argument)kennyj2011-11-241-3/+3
| |/ / / /
* | | | | Rely on a public contract between railties instead of accessing railtie metho...José Valim2011-11-2312-54/+94
* | | | | Optimize cache expansion by skipping rails cache id in nested keys.José Valim2011-11-232-58/+64
* | | | | Merge pull request #3738 from exviva/issues/3737_AS_cache_expand_cache_keyJosé Valim2011-11-232-13/+26
|\ \ \ \ \
| * | | | | Fix #3737 AS::expand_cache_key generates wrong key in certain situations (par...Olek Janiszewski2011-11-232-3/+14
| * | | | | Fix #3737 AS::expand_cache_key generates wrong key in certain situationsOlek Janiszewski2011-11-232-12/+14
| |/ / / /
* | | | | Merge pull request #3735 from kennyj/fix_3728José Valim2011-11-233-6/+25
|\ \ \ \ \ | |/ / / / |/| | | |