active_model_serializers/lib
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
..
action_controller Add config.serializer_lookup_enabled that defaults true 2015-11-30 00:20:58 -06:00
active_model Merge branch 'master' into domitian-move-namespace-of-adapter-to-active-model-serializers 2016-02-23 23:21:49 -06:00
active_model_serializers Merge branch 'master' into domitian-move-namespace-of-adapter-to-active-model-serializers 2016-02-23 23:21:49 -06:00
generators/rails Only load generators when needed 2016-01-15 01:52:27 -06:00
grape Grape formatter feature requested in #1258 2015-12-10 10:06:40 +00:00
active_model_serializers.rb Moved the adapter and adapter folder to active_model_serializers folder and changed the module namespace 2016-02-23 21:49:58 -06:00