Merge 2.2 into master #1917
Merged
Merge 2.2 into master #1917
Conversation
This file contains hidden or 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
Move coverage jobs to CircleCI
add some local caches where they are missing
Allow subresource items in the iri converter
…keys fix normalizer cache key generation
…force-eager EagerLoadingExtension: respect fetchEager=false on an association
…-casting [Bug] Fix integer Identifiers denormalization
…filter Simplify boolean filter
…mplify-boolean-filter Revert "Simplify boolean filter"
RFC: Cache trait
|
That explains #1899 (comment) |
|
Thanks @teohhanhui ! What do we need to do to fix 2.2? |
|
@soyuka My suggestion in #1850 (comment). Not sure if there's a better way? |
|
But I think my assertion that we need to merge |
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.
Necessary to unblock PRs that target
master, because the CircleCI build would be failing otherwise. Replaces #1909.Also, since we've messed up the
2.2branch by accidentally merging inmasterin #1850, we need everything to be merged intomasterbefore it is safe to clean up the2.2branch.