3 Commits

Author SHA1 Message Date
Tim Graham
3cd9a4b1ea [1.11.x] Sorted imports per isort 4.2.9.
Backport of cde31daf8815e05b4b86b857b49fb0e31e1f0a38 from master
2017-06-01 13:30:08 -04:00
Alasdair Nicol
15ce1a735c Used more specific assertion in check_framework tests. 2015-09-19 18:35:05 -04:00
Daniel Roseman
24620d71f2 Fixed #25079 -- Added warning if both TEMPLATES and TEMPLATE_* settings are defined.
Django ignores the value of the TEMPLATE_* settings if TEMPLATES is also
set, which is confusing for users following older tutorials. This change
adds a system check that warns if any of the TEMPLATE_* settings have
changed from their defaults but the TEMPLATES dict is also non-empty.

Removed the TEMPLATE_DIRS from the test settings file; this was marked
for removal in 1.10 but no tests fail if it is removed now.
2015-07-13 17:50:22 -04:00