Adam Stanton da26ebd26f Merge branch 'create-default-serializer' into HEAD ... Conflicts: lib/active_model/array_serializer.rb		2013-03-05 21:48:58 -08:00
..
array_serializer_test.rb	Restore order of fields in hash to original order.	2013-02-11 07:04:59 -08:00
association_test.rb	Adding 'embed_key' option to allow embedding attributes other than ID	2013-03-05 18:52:31 -05:00
generators_test.rb	Fix failing tests on Rails master	2012-11-25 14:56:58 -05:00
no_serialization_scope_test.rb	Allows serialization_scope to be disabled with serialization_scope nil	2012-06-05 12:37:09 -04:00
serialization_test.rb	serialization test: respect root settings when root object is nil	2013-02-26 11:12:28 +01:00
serializer_support_test.rb	Test : use a deducted serializer on non-ActiveRecord models	2012-12-20 17:06:19 +01:00
serializer_test.rb	Merge pull request #213 from michihuber/fix_rendering_nil_with_custom_serializer	2013-03-05 15:54:51 -08:00
test_fakes.rb	changes to be able to specify multiple attributes with keys	2013-03-05 02:45:22 +00:00
test_helper.rb	match method should not be used for routes; instead, a specific HTTP method should be used	2012-09-20 21:17:07 -04:00