Merge 0-10-stable into master (to fix breaking change). #2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix typos and capitalization in Relationship Links docs [ci skip]
Run tests by Ruby 2.2.6 and 2.3.3
Promote important architecture description that answers a lot of questions we get Conflicts: docs/ARCHITECTURE.md
Fix typos [ci skip]
Link to 0.10.3 tag instead of `master` branch
Test was failing due to change in JSON exception message when parsing empty string
* delete KeyTransform, use CaseTransform * added changelog Conflicts: CHANGELOG.md
Update jsonapi runtime dependency to 0.1.1.beta6
Prepare release of 0.10.4
Bump to v0.10.4 [ci skip] Conflicts: CHANGELOG.md
Fix AMS warnings
Silence Grape warnings
Fix mt6 assert_nil warnings
* Updated isolated tests to assert correct behavior. * Added check to get unsafe params if rails version is great than 5
…enderer_tests_a_bit Cleanup assertions in isolated jsonapi renderer tests a bit
Add Model#attributes helper; make test attributes explicit
Fix model attribute accessors
Fix relationship links doc Conflicts: CHANGELOG.md
Conflicts: CHANGELOG.md lib/active_model_serializers/model.rb test/action_controller/namespace_lookup_test.rb test/active_model_serializers/model_test.rb test/active_model_serializers/register_jsonapi_renderer_test_isolated.rb test/cache_test.rb test/fixtures/poro.rb test/serializers/associations_test.rb
|
@bf4, thanks for your PR! By analyzing the history of the files in this pull request, we identified @iancanderson, @kevintyll and @NullVoxPopuli to be potential reviewers. |
GregPK
pushed a commit
to GregPK/active_model_serializers
that referenced
this pull request
Apr 25, 2017
* Merge pull request rails-api#1990 from mxie/mx-result-typo Fix typos and capitalization in Relationship Links docs [ci skip] * Merge pull request rails-api#1992 from ojiry/bump_ruby_versions Run tests by Ruby 2.2.6 and 2.3.3 * Merge pull request rails-api#1994 from bf4/promote_architecture Promote important architecture description that answers a lot of questions we get Conflicts: docs/ARCHITECTURE.md * Merge pull request rails-api#1999 from bf4/typos Fix typos [ci skip] * Merge pull request rails-api#2000 from berfarah/patch-1 Link to 0.10.3 tag instead of `master` branch * Merge pull request rails-api#2007 from bf4/check_ci Test was failing due to change in JSON exception message when parsing empty string * Swap out KeyTransform for CaseTransform (rails-api#1993) * delete KeyTransform, use CaseTransform * added changelog Conflicts: CHANGELOG.md * Merge pull request rails-api#2005 from kofronpi/support-ruby-2.4 Update jsonapi runtime dependency to 0.1.1.beta6 * Bump to v0.10.4 * Merge pull request rails-api#2018 from rails-api/bump_version Bump to v0.10.4 [ci skip] Conflicts: CHANGELOG.md * Merge pull request rails-api#2019 from bf4/fix_method_redefined_warning Fix AMS warnings * Merge pull request rails-api#2020 from bf4/silence_grape_warnings Silence Grape warnings * Merge pull request rails-api#2017 from bf4/remove_warnings Fix mt6 assert_nil warnings * Updated isolated tests to assert correct behavior. (rails-api#2010) * Updated isolated tests to assert correct behavior. * Added check to get unsafe params if rails version is great than 5 * Merge pull request rails-api#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 rails-api#1981 from groyoh/link_doc Fix relationship links doc Conflicts: CHANGELOG.md
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.