Benjamin Fleischer 93ca27fe44 Merge 0-10-stable into master (to fix breaking change). (#2023) ... * Merge pull request #1990 from mxie/mx-result-typo Fix typos and capitalization in Relationship Links docs [ci skip] * Merge pull request #1992 from ojiry/bump_ruby_versions Run tests by Ruby 2.2.6 and 2.3.3 * Merge pull request #1994 from bf4/promote_architecture Promote important architecture description that answers a lot of questions we get Conflicts: docs/ARCHITECTURE.md * Merge pull request #1999 from bf4/typos Fix typos [ci skip] * Merge pull request #2000 from berfarah/patch-1 Link to 0.10.3 tag instead of `master` branch * Merge pull request #2007 from bf4/check_ci Test was failing due to change in JSON exception message when parsing empty string * Swap out KeyTransform for CaseTransform (#1993) * delete KeyTransform, use CaseTransform * added changelog Conflicts: CHANGELOG.md * Merge pull request #2005 from kofronpi/support-ruby-2.4 Update jsonapi runtime dependency to 0.1.1.beta6 * Bump to v0.10.4 * Merge pull request #2018 from rails-api/bump_version Bump to v0.10.4 [ci skip] Conflicts: CHANGELOG.md * Merge pull request #2019 from bf4/fix_method_redefined_warning Fix AMS warnings * Merge pull request #2020 from bf4/silence_grape_warnings Silence Grape warnings * Merge pull request #2017 from bf4/remove_warnings Fix mt6 assert_nil warnings * Updated isolated tests to assert correct behavior. (#2010) * Updated isolated tests to assert correct behavior. * Added check to get unsafe params if rails version is great than 5 * Merge pull request #2012 from bf4/cleanup_isolated_jsonapi_renderer_tests_a_bit Cleanup assertions in isolated jsonapi renderer tests a bit * Add Model#attributes helper; make test attributes explicit * Fix model attributes accessors * Fix typos * Randomize testing of compatibility layer against regressions * Test bugfix * Add CHANGELOG * Merge pull request #1981 from groyoh/link_doc Fix relationship links doc Conflicts: CHANGELOG.md		2017-01-10 02:28:50 -06:00
..
test	Less strict exception matching	2016-12-24 21:29:46 -06:00
adapter_for_test.rb	Add missing object context needed for tests to be run alone	2016-03-25 00:20:10 -05:00
json_pointer_test.rb	Fix typos	2016-12-11 23:41:23 -06:00
logging_test.rb	Move SerializableResource to ActiveModelSerializers namespace	2016-03-30 11:33:04 +02:00
model_test.rb	Merge 0-10-stable into master (to fix breaking change). (#2023)	2017-01-10 02:28:50 -06:00
railtie_test_isolated.rb	Improve tests found by assert_nil	2017-01-06 23:17:43 -06:00
register_jsonapi_renderer_test_isolated.rb	Merge 0-10-stable into master (to fix breaking change). (#2023)	2017-01-10 02:28:50 -06:00
serialization_context_test_isolated.rb	Fix #1759, Grape integration, adds serialization_context	2016-06-14 09:45:30 -05:00