GitHub PushEvent at 2014-12-28 01:55:44
Repository: django
Actor: s2m-updater
Payload: {"shas":[["322560489b2d2f873c7b8bd7799efd7cf80fb28b","f1dda22f6c87388a4ea6486ed19dfd0f6f6df13d@2xlibre.net","[1.7.x] Fixed #24051 -- Made schema infrastructure honor tablespaces\n\nPartial backport of 30cbd5d36. Thanks Douglas J. Reynolds for the\nreport and initial patch.","Claude Paroz",true],["965a999ae5a03ca595f3842feacfbce5dc12f20a","46f1a0bd5592a2f9244ca321b129902a06b53e03@wr.waw.pl","[1.7.x] Fixed #23929 -- Added more tests for create_default_site.\n\nBackport of 1f98ec2e53e4636863396ab54f671f4546f9ba4c from master","wrwrwr",true],["a79012f6d88a8cd67bd35c54b91d826f2b7a4cb2","7d64dbc04187ef4ff3002b119b8edfcfccfa8892@gmail.com","[1.7.x] Fixed #24000 -- Corrected contrib.sites default site creation in a multiple database setup.\n\nBackport of 89e2c60f4396241c667b7a1de37765b7c96d702f from master","Tim Graham",true],["b429a9796a162f9e12e6d34579468621ba9accc7","12583540a3ce90b5e7fbe9676bfd977beeacbf4e@m4x.org","[1.7.x] Fixed an inconsistency introduced in 547b1810.\n\nmark_safe and mark_for_escaping should have been kept similar.\n\nOn Python 2 this change has no effect. On Python 3 it fixes the use case\nshown in the regression test for mark_for_escaping, which used to raise\na TypeError. The regression test for mark_safe is just for completeness.\n\nBackport of 5c5eb5fe from master.","Aymeric Augustin",true],["3483682749577b4b5a8141a766489d5b460e30e9","12583540a3ce90b5e7fbe9676bfd977beeacbf4e@m4x.org","[1.7.x] Fixed #23831 -- Supported strings escaped by third-party libs in Django.\n\nRefs #7261 -- Made strings escaped by Django usable in third-party libs.\n\nThe changes in mark_safe and mark_for_escaping are straightforward. The\nmore tricky part is to handle correctly objects that implement __html__.\n\nHistorically escape() has escaped SafeData. Even if that doesn't seem a\ngood behavior, changing it would create security concerns. Therefore\nsupport for __html__() was only added to conditional_escape() where this\nconcern doesn't exist.\n\nThen using conditional_escape() instead of escape() in the Django\ntemplate engine makes it understand data escaped by other libraries.\n\nTemplate filter |escape accounts for __html__() when it's available.\n|force_escape forces the use of Django's HTML escaping implementation.\n\nHere's why the change in render_value_in_context() is safe. Before Django\n1.7 conditional_escape() was implemented as follows:\n\n    if isinstance(text, SafeData):\n        return text\n    else:\n        return escape(text)\n\nrender_value_in_context() never called escape() on SafeData. Therefore\nreplacing escape() with conditional_escape() doesn't change the\nautoescaping logic as it was originally intended.\n\nThis change should be backported to Django 1.7 because it corrects a\nfeature added in Django 1.7.\n\nThanks mitsuhiko for the report.\n\nBackport of 6d52f6f from master.","Aymeric Augustin",true],["1cbdb49b0aaba726435db55c4d71dc6a8ade1d2b","7d64dbc04187ef4ff3002b119b8edfcfccfa8892@gmail.com","[1.7.x] Fixed #24056 -- Fixed syntax highlighting in topics/testing/tools.txt.\n\nBackport of 3d0c3a0482496fc1914a40ec3c3eb70e67f0d643 from master","Tim Graham",true]],"size":6,"ref":"refs/heads/original_stable/1.7.x","head":"1cbdb49b0aaba726435db55c4d71dc6a8ade1d2b"}