diff options
| author | José Valim <jose.valim@gmail.com> | 2011-11-25 09:58:18 +0000 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-11-25 09:59:35 +0000 |
| commit | fcacc6986ab60f1fb2e423a73bf47c7abd7b191d (patch) | |
| tree | b4176f645915ac80d2ba43b54aa836d3bc4f7d21 /actionpack/lib/abstract_controller/rendering.rb | |
| parent | 4565c871a63dddcb9543eb5be315f152ac551c17 (diff) | |
| parent | 696d01f7f4a8ed787924a41cce6df836cd73c46f (diff) | |
| download | rails-fcacc6986ab60f1fb2e423a73bf47c7abd7b191d.tar.gz rails-fcacc6986ab60f1fb2e423a73bf47c7abd7b191d.tar.bz2 rails-fcacc6986ab60f1fb2e423a73bf47c7abd7b191d.zip | |
Merge branch 'serializers'
This implements the ActiveModel::Serializer object. Includes code, tests, generators and guides.
From José and Yehuda with love.
Conflicts:
railties/CHANGELOG.md
Diffstat (limited to 'actionpack/lib/abstract_controller/rendering.rb')
0 files changed, 0 insertions, 0 deletions