Merge 2.5 onto master #3277
Merged
Merge 2.5 onto master #3277
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
…alse-positive-fixed Remove a false positive that has been fixed
teohhanhui
reviewed
Nov 19, 2019
| @@ -38,7 +45,7 @@ | |||
|
|
|||
| * Allow to not declare GET item operation | |||
| * Add support for the Accept-Patch header | |||
| * Make the the `maximum_items_per_page` attribute consistent with other attributes controlling pagination | |||
| * Make the the `maximum_items_per_page` attribute consistent with other attributes controlling pagination | |||
There was a problem hiding this comment.
needs to be fixed in 2.5 ? :p
teohhanhui
approved these changes
Nov 19, 2019
|
This PR is not good and causes conflicts. The SHA of the commits have changed. |
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.