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
..
adapters.md	Moved the adapter and adapter folder to active_model_serializers folder and changed the module namespace	2016-02-23 21:49:58 -06:00
caching.md	[DOCS] Refactor, update, create documentation [ci skip]	2015-12-14 14:38:29 -06:00
configuration_options.md	Replace load hook :active_model_serializers with :action_controller	2016-01-15 01:58:14 -06:00
getting_started.md	fix link on Getting Started	2015-12-29 22:52:22 -06:00
instrumentation.md	Moved the adapter and adapter folder to active_model_serializers folder and changed the module namespace	2016-02-23 21:49:58 -06:00
logging.md	Fix grammar per duduribeiro [ci skip]	2015-12-15 21:34:25 -06:00
rendering.md	Address concerns from #1018 commit c59668e	2016-02-08 17:55:15 -06:00
serializers.md	Add symbol support for ActiveModel::Serializer.type method	2016-02-19 17:05:13 +01:00