Merge upstream master into prevent_deadlock #1
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
…ustom-field-name fix issue with custom order_field_name and update README
…rder-with-respect-to bulk_create for order_with_respect_to
Fix bulk_create
travis: test on Ubuntu 18
travis: Test on django 3.0
Use tox for testing
…ic-regression Fix OrderedModelQuerySet returning parent instances
…pect-to-kwargs fix: admin order_with_respcet calling non exisiting instance method
…-markdown Add missing closing parenthese + small md syntax
…custom-order-field-docs Mention use of custom Ordering field in the docs
Conflicts: ordered_model/models.py tests/tests.py
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.
This brings changes from bfirsh/master into the prevent_deadlock branch. Tests pass but I haven't been able to test the concurrency on a real project.