| Age | Commit message (Collapse) | Author |
|
Backport of 65441bbdb02427655869c42791a0bc5a9c631292 from master
|
|
instance.
Backport of 4c2f546b55c029334d22e69bb29db97f9356faa3 from master
|
|
Backport of 8e129b42ad9c9adca599228ae2ad68271fa46d44 from master
|
|
Backport of 32c108a221c54a4f680afe32175d70b5d2e92593 from master
|
|
Backport of 25a0b5cdcd5e70a6563116639a477b915ee5784e from master
|
|
Backport of 3d8fee605184d8ffa47a32546298b52b52d7a087 from master
|
|
Backport of f6d087b628a61a7b036cc468328497082031dc8e from master
|
|
Backport of 250a3d199310a954a95fb1ffa4915f0e51ba1767 from master
|
|
Backport of ff67ce5076c1f4d3dc32fd755a1b65d3310c6cb1 from master
|
|
Backport of 06ffc764a9b2d2521e6a574d279b66ad411cc65c from master
|
|
Backport of 441a47e1efd46001ca454b80e0d5f8c5ea4e235b from master
|
|
Backport of 1827aa902481cd80d2fb154e7b073f139936d5fc from master
|
|
Backport of 2be6b526568aaaae5353a4a600a085d3c2135363 from master
|
|
Specifically stopped using the dir argument.
Backport of a8fe12417f778a76837f8e4f8503779f52a396ba from master
|
|
Dropped the DJANGO_TEST_TEMP_DIR environment variable.
Before this change, proper removal depended on the developer passing
dir=os.environ['DJANGO_TEST_TMP_DIR'] to tempfile functions.
Backport of 934400759de817471ff37d736686201d7ae34e82 from master
|
|
have defaults.
Backport of 1306cd1e8acfb13602ee8dc40993b2505cd7523b from master
|
|
These cached properies were causing problems with pickling, and in
addition they were confusingly defined: field.rel.model._meta was
not the same as field.rel.opts.
Instead users should use field.rel.related_model._meta inplace of
field.rel.opts, and field.rel.to._meta in place of field.rel.to_opts.
Backport of f95122e541df5bebb9b5ebb6226b0013e5edc893 from master
|
|
graphs.
Switched from an adjancency list and uncached, iterative depth-first
search to a Node-based design with direct parent/child links and a
cached, recursive depth-first search. With this change, calculating
a migration plan for a large graph takes several seconds instead of
several hours.
Marked test `migrations.test_graph.GraphTests.test_dfs` as an expected
failure due to reaching the maximum recursion depth.
Backport of 78d43a5e1064b63db1c486516c4263ef1c4c975c from master
|
|
Thanks uranusjr for the report and analysis.
Backport of 88a5f17 from master
|
|
Backport of ea3168dc6ced391d848c511a14cfcecfeac9d401 from master
|
|
Backport of 787dd6519a791f210dc8275eaf2fd41454bf9670 from master
|
|
In addition to simplifying the code, this reduces the number of writes.
Backport of bd059e3f8c6311dcaf8afe5e29ef373f7f84cf26 from master
|
|
This makes the staticfiles tests 2.5 times faster.
Backport of 2bb5b0e09863df65756fe0050406163cb70750f1 from master
Backport of bd059e3f8c6311dcaf8afe5e29ef373f7f84cf26 from master
|
|
It should have been removed when the ADMIN_MEDIA_PREFIX setting was deprecated.
Backport of 1d9d39fa1c60896e31360d5f8d6b972979ee7c95 from master
|
|
Refs 5355baf6c770ac1e5c7f7a4f86ef95042f76b8b4.
|
|
This reverts commit 88e6fbb2e341657cb5365b9b78fb44e3c7065d2d.
|
|
Backport of 1d1d5d1c315e0e58f02a7f2a07b56ed20b09c087 from master
|
|
|
|
|
|
Backport of bad5f262bf4a17f157808ec1aa225ba9c94c1eee from master
|
|
The new signature enables better support for routing RunPython and
RunSQL operations, especially w.r.t. reusable and third-party apps.
This commit also takes advantage of the deprecation cycle for the old
signature to remove the backward incompatibility introduced in #22583;
RunPython and RunSQL won't call allow_migrate() when when the router
has the old signature.
Thanks Aymeric Augustin and Tim Graham for helping shape up the patch.
Refs 22583.
Conflicts:
django/db/utils.py
Backport of bed504d70bede3431a213203c13a33905d6dbf77 from master
|
|
Thanks to DavidMuller for the report.
Backport of c490e410af from master
|
|
As suggested by Anssi. This has the slightly strange side effect of
passing the expression to Expression.convert_value has the expression
passed back to it, but it allows more complex patterns of expressions.
Backport of 32d4db66b9 from master
|
|
Joint effort between myself, Josh, Anssi and Shai.
Conflicts:
django/db/models/query.py
tests/model_fields/models.py
Backport of 4755f8fc25331c739a6f932cc8aba0cc9e62e352 from master.
|
|
Backport of e467919c6315be87abec72383ec1a81e2665ebec from master
|
|
This opens more possibilities, like accessing context.template.origin.
It also follows the chain of objects instead of following a shortcut.
Backport of 1bfcc95 from master
|
|
Workaround for http://bugs.python.org/issue20747.
In some corner cases, Python 2 inserts a newline in a header value
despite `maxlinelen` passed in Header constructor.
Thanks Tim Graham for the review.
Backport of efb1f99f94 from master.
|
|
Oracle
Thanks Joris Benschop for the report, and Tim Graham for the tests.
Backport of ceadc94f09 from master
|
|
schema editor
Thanks Tim Graham for pointing out the fix.
Backport of f7d34fe from master ticket_24362
|
|
swappable models
Swapped out models don't have a _default_manager unless they have
explicitly defined managers. ModelState.from_model() now accounts for
this case and uses an empty list for managers if no explicit managers
are defined and a model is swapped out.
Backport of 15dc8d1c9d3697170a2c59ecaa7a2b4ba58f5990 from master
|
|
on a non-ASCII path.
Backport of b8d6cdbcc90ff8af781d13131b79ce88a9eff66d from master
|
|
source contains non-ASCII characters.
Backport of 307c0f299a6c26f5231d3516df5b4edc54b36553 from master
|
|
on Windows.
Backport of ad50b6c853f4a6c864219fbd38b4254ffaef7b1c from master
|
|
non-ASCII path.
Backport of d316b43d0ab9db0f9913b094b84b11362d36d054 from master
|
|
Backport of 8b39f33d78ce5749f8ca40a7ae6823b5f6c26c09 from master
|
|
contrib.postgres).
Backport of 3adc5f1ee6618a615db07d4a868b366a15c39f82 from master
|
|
Backport of 664c038f2c5b56d1ce929243d29cd4e11ea5f9ea from master
|
|
|
|
Backport of d538e37e1b14603d1d0c94f185f378fc0ed1e53f from master
|
|
type to FK
Thanks Jeff Singer for the test case.
Backport of 273bc4b667b964b69b15bc438bcdae3dc6529a2a from master
|