active_model_serializers/test/action_controller
Benjamin Fleischer 25c9df0b97 Merge branch 'master' into domitian-move-namespace-of-adapter-to-active-model-serializers
Conflicts:
	CHANGELOG.md
	lib/active_model/serializer/adapter/attributes.rb
	lib/active_model/serializer/adapter/cached_serializer.rb
	lib/active_model/serializer/adapter/fragment_cache.rb
	lib/active_model/serializer/adapter/json_api.rb
	lib/active_model/serializer/adapter/json_api/link.rb
	test/adapter/fragment_cache_test.rb
	test/adapter/json_api/links_test.rb
	test/adapter/json_api/resource_type_config_test.rb
2016-02-23 23:21:49 -06:00
..
json Refactors of the Attribute adapter. Adds support for nested associations specified from the include key in the controller. Adds some tests and some method documentation 2015-09-21 10:35:47 -04:00
json_api Add support for JSON API deserialization (experimental). 2016-01-13 05:48:06 +01:00
adapter_selector_test.rb Add PORO serializable base class: ActiveModelSerializers::Model 2015-10-14 21:33:02 -05:00
explicit_serializer_test.rb Rubocop: Consistent spacing 2015-09-03 20:51:40 -05:00
serialization_scope_name_test.rb Rails5 requires x_action 2015-11-25 22:06:20 -06:00
serialization_test.rb Merge branch 'master' into domitian-move-namespace-of-adapter-to-active-model-serializers 2016-02-23 23:21:49 -06:00