Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: django/django
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3.1
Choose a base ref
...
head repository: django/django
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3.1.13
Choose a head ref

Commits on Aug 4, 2020

  1. Copy the full SHA
    795943e View commit details
  2. [3.1.x] Added stub release notes for 3.1.1.

    Backport of 6c19230 from master
    felixxm committed Aug 4, 2020
    Copy the full SHA
    42e31d4 View commit details

Commits on Aug 5, 2020

  1. [3.1.x] Fixed #31853 -- Fixed wrapping of translated action labels in…

    … admin sidebar.
    
    Backport of b0af56f from master
    007gzs authored and carltongibson committed Aug 5, 2020
    Copy the full SHA
    ff8e6e8 View commit details
  2. [3.1.x] Fixed #31854 -- Fixed wrapping of long model names in admin's…

    … sidebar.
    
    Backport of e70dc50 from master
    felixxm authored and carltongibson committed Aug 5, 2020
    Copy the full SHA
    1c3d329 View commit details
  3. [3.1.x] Fixed #29336 -- Doc'd circular template inheritance

    Backport of 2c2f4b3 from master
    smithdc1 authored and carltongibson committed Aug 5, 2020
    Copy the full SHA
    b81cdaf View commit details
  4. [3.1.x] Added Hypercorn to ASGI deployment guide.

    Backport of 1bd1264 from master
    pgjones authored and carltongibson committed Aug 5, 2020
    Copy the full SHA
    20ec568 View commit details

Commits on Aug 7, 2020

  1. [3.1.x] Fixed typo in docs/ref/contrib/postgres/fields.txt.

    Backport of cdead4f from master
    b0uh authored and felixxm committed Aug 7, 2020
    Copy the full SHA
    81ed126 View commit details
  2. [3.1.x] Removed unnecessary sentence in QuerySet docs.

    Backport of 6e9c5ee from master
    adamalton authored and felixxm committed Aug 7, 2020
    Copy the full SHA
    1e3d8bd View commit details
  3. [3.1.x] Fixed #31864 -- Fixed encoding session data during transition…

    … to Django 3.1.
    
    Thanks אורי for the report.
    Backport of 99abfe8 from master
    felixxm committed Aug 7, 2020
    Copy the full SHA
    c21bbe0 View commit details

Commits on Aug 8, 2020

  1. [3.1.x] Refs #31864 -- Doc'd that DEFAULT_HASHING_ALGORITHM requires …

    …3.1.1+ in release notes.
    
    Backport of b2b0711 from master
    uri-rodberg authored and carltongibson committed Aug 8, 2020
    Copy the full SHA
    cdfdbb3 View commit details

Commits on Aug 10, 2020

  1. [3.1.x] Fixed #31871 -- Updated SESSION_COOKIE_SAMESITE comment in gl…

    …obal_settings.py.
    
    Follow up to b33bfc3.
    Backport of ad827dd from master
    uri-rodberg authored and felixxm committed Aug 10, 2020
    Copy the full SHA
    a1ce98f View commit details

Commits on Aug 11, 2020

  1. [3.1.x] Added note about password updates on argon2 attributes change.

    Backport of 804f2b7 from master
    wontonst authored and felixxm committed Aug 11, 2020
    Copy the full SHA
    02572bf View commit details
  2. [3.1.x] Added stub release notes for 2.2.16 and 3.0.10.

    Backport of 8a5683b from master
    felixxm committed Aug 11, 2020
    Copy the full SHA
    daf4f70 View commit details
  3. [3.1.x] Fixed #31865 -- Adjusted admin nav sidebar template to reduce…

    … debug logging.
    
    Thanks to Mariusz Felisiak for review.
    
    Backport of 0aeb802 from master
    carltongibson committed Aug 11, 2020
    Copy the full SHA
    02b474f View commit details
  4. [3.1.x] Fixed #31866 -- Fixed locking proxy models in QuerySet.select…

    …_for_update(of=()).
    
    Backport of 6062616 from master
    danifus authored and felixxm committed Aug 11, 2020
    Copy the full SHA
    f139372 View commit details

Commits on Aug 13, 2020

  1. [3.1.x] Fixes #31877 -- Used lazy() for TemplateView kwarg deprecatio…

    …n warning.
    
    SimpleLazyObjects cause a crash when filtering.
    
    Thanks Tim L. White for the report.
    Regression in 4ed5347.
    
    Backport of 20799cc from master
    adamchainz authored and felixxm committed Aug 13, 2020
    Copy the full SHA
    9ae40d8 View commit details
  2. [3.1.x] Fixed #31863 -- Prevented mutating model state by copies of m…

    …odel instances.
    
    Regression in bfb746f.
    
    Backport of 94ea79b from master
    GertBurger authored and felixxm committed Aug 13, 2020
    Copy the full SHA
    85c47b9 View commit details
  3. [3.1.x] Refs #31863 -- Added release notes for 94ea79b.

    Backport of 21768a9 from master
    felixxm committed Aug 13, 2020
    Copy the full SHA
    18e87ac View commit details

Commits on Aug 17, 2020

  1. [3.1.x] Fixed #31892 -- Added backward incompatibility note about Med…

    …ia <script> tags changes.
    
    Refs 31080.
    
    Backport of dd5173c from master
    jdufresne authored and felixxm committed Aug 17, 2020
    Copy the full SHA
    c5a8042 View commit details

Commits on Aug 18, 2020

  1. [3.1.x] Refs #17642 -- Doc'd min_num and validate_min arguments in mo…

    …delformset_factory() docs.
    
    Changed arguments ordering to match the modelformset_factory()
    signature.
    
    Backport of 13704b0 from master.
    felixxm committed Aug 18, 2020
    Copy the full SHA
    6eb0f4f View commit details
  2. [3.1.x] Fixed #27679 -- Doc'd that empty formsets display extra + min…

    …_num forms.
    
    Backport of e2e34f4 from master
    smithdc1 authored and felixxm committed Aug 18, 2020
    Copy the full SHA
    b2fc529 View commit details

Commits on Aug 19, 2020

  1. [3.1.x] Fixed #31895 -- Fixed crash when decoding invalid session data.

    Thanks Matt Hegarty for the report.
    Regression in d4fff71.
    Backport of 4376c2c from master
    felixxm committed Aug 19, 2020
    Copy the full SHA
    7eaa277 View commit details

Commits on Aug 20, 2020

  1. Copy the full SHA
    26ccc77 View commit details
  2. [3.1.x] Improved wording in async views docs.

    Backport of 4172560 from master
    fisadev authored and felixxm committed Aug 20, 2020
    Copy the full SHA
    af190bf View commit details

Commits on Aug 21, 2020

  1. [3.1.x] Fixed #31906 -- Fixed typo in docs/ref/forms/fields.txt.

    Backport of 927bd88 from master
    ninad-k authored and felixxm committed Aug 21, 2020
    Copy the full SHA
    8fb24a5 View commit details
  2. [3.1.x] Fixed #31925 -- Fixed typo in docs/releases/3.0.txt.

    Backport of 3e753d3 from master
    kc611 authored and felixxm committed Aug 21, 2020
    Copy the full SHA
    5d55b87 View commit details

Commits on Aug 24, 2020

  1. [3.1.x] Refs #31877 -- Reverted "Fixes #31877 -- Used lazy() for Temp…

    …lateView kwarg deprecation warning."
    
    This reverts commit 20799cc.
    
    Backport of 04e87e7 from master
    felixxm committed Aug 24, 2020
    Copy the full SHA
    f247c66 View commit details
  2. [3.1.x] Fixed #31877 -- Reverted "Fixed #19878 -- Deprecated Template…

    …View passing URL kwargs into context."
    
    This reverts commit 4ed5347.
    
    Backport of bb8f669 from master
    felixxm committed Aug 24, 2020
    Copy the full SHA
    e81aa7a View commit details

Commits on Aug 26, 2020

  1. [3.1.x] Fixed #31905 -- Made MiddlewareMixin call process_request()/p…

    …rocess_response() with thread sensitive.
    
    Co-authored-by: Carlton Gibson <carlton.gibson@noumenal.es>
    
    Backport of 547a07f from master
    Michael Galler authored and felixxm committed Aug 26, 2020
    Copy the full SHA
    b6d2419 View commit details
  2. [3.1.x] Fixed #31936 -- Fixed __in lookup on key transforms for JSONF…

    …ield.
    
    This resolves an issue on databases without a native JSONField
    (MariaDB, MySQL, SQLite, Oracle), where values must be wrapped.
    
    Thanks Sébastien Pattyn for the report.
    Backport of 1251772 from master
    felixxm committed Aug 26, 2020
    Copy the full SHA
    9075d1f View commit details

Commits on Aug 28, 2020

  1. [3.1.x] Fixed #31912 -- Removed strict=True in Path.resolve() in proj…

    …ect template and CommonPasswordValidator.
    
    This caused permission errors when user didn't have permissions to
    all intermediate directories in a Django installation path.
    
    Thanks tytusd and leonyxz for reports.
    
    Regression in edeec12 and
    26554cf.
    Backport of e39e727 from master
    felixxm committed Aug 28, 2020
    Copy the full SHA
    14a1970 View commit details
  2. [3.1.x] Fixed #31928 -- Fixed detecting an async get_response in vari…

    …ous middlewares.
    
    SecurityMiddleware and the three cache middlewares were not calling
    super().__init__() during their initialization or calling the required
    MiddlewareMixin._async_check() method.
    
    This made the middlewares not properly present as coroutine and
    confused the middleware chain when used in a fully async context.
    
    Thanks Kordian Kowalski for the report.
    
    Backport of 825ce75 from master
    Kevin Michel authored and felixxm committed Aug 28, 2020
    Copy the full SHA
    3a42c04 View commit details
  3. [3.1.x] Fixed #31956 -- Fixed crash of ordering by JSONField with a c…

    …ustom decoder on PostgreSQL.
    
    Thanks Marc Debureaux for the report.
    Thanks Simon Charette, Nick Pope, and Adam Johnson for reviews.
    
    Backport of 0be51d2 from master
    felixxm committed Aug 28, 2020
    Copy the full SHA
    655e1ce View commit details

Commits on Aug 31, 2020

  1. [3.1.x] Fixed #31965 -- Adjusted multi-table fast-deletion on MySQL/M…

    …ariaDB.
    
    The optimization introduced in 7acef09 did not properly handle
    deletion involving filters against aggregate annotations.
    
    It initially was surfaced by a MariaDB test failure but misattributed
    to an undocumented change in behavior that resulted in the systemic
    generation of poorly performing database queries in 5b83bae.
    
    Thanks Anton Plotkin for the report.
    
    Refs #23576.
    
    Backport of f6405c0 from master
    charettes authored and felixxm committed Aug 31, 2020
    Copy the full SHA
    2986ec0 View commit details
  2. [3.1.x] Fixed #31952 -- Fixed EmptyFieldListFilter crash with reverse…

    … relationships.
    
    Thanks dacotagh for the report.
    
    Backport of 179d9dc from master
    jmfederico authored and felixxm committed Aug 31, 2020
    Copy the full SHA
    c4e5384 View commit details
  3. [3.1.x] Fixed #31934 -- Added note about the default of SameSite cook…

    …ie flag in modern browsers.
    
    Backport of 70731fc from master
    hramezani authored and felixxm committed Aug 31, 2020
    Copy the full SHA
    eda59ba View commit details
  4. [3.1.x] Corrected note about long names in search docs.

    Backport of fcad0b1 from master
    adursun authored and felixxm committed Aug 31, 2020
    Copy the full SHA
    42f8c08 View commit details

Commits on Sep 1, 2020

  1. [3.1.x] Fixed #31901 -- Prevented content overflowing in the admin ch…

    …angelist with navigation sidebar.
    
    Backport of 2bc38bc from master
    007gzs authored and felixxm committed Sep 1, 2020
    Copy the full SHA
    dfa31f8 View commit details
  2. [3.1.x] Fixed CVE-2020-24583, #31921 -- Fixed permissions on intermed…

    …iate-level static and storage directories on Python 3.7+.
    
    Thanks WhiteSage for the report.
    
    Backport of ea0febbba531a3ecc8c77b570efbfb68ca7155db from master.
    felixxm authored and carltongibson committed Sep 1, 2020
    Copy the full SHA
    934430d View commit details
  3. [3.1.x] Fixed CVE-2020-24584 -- Fixed permission escalation in interm…

    …ediate-level directories of the file system cache on Python 3.7+.
    
    Backport of f56b57976133129b0b351a38bba4ac882badabf0 from master.
    felixxm authored and carltongibson committed Sep 1, 2020
    Copy the full SHA
    2b099ca View commit details
  4. [3.1.x] Added release date for 3.1.1, 3.0.10, and 2.2.16.

    Backport of 976e2b7 from master
    carltongibson committed Sep 1, 2020
    Copy the full SHA
    1ef3800 View commit details
  5. Copy the full SHA
    f33c252 View commit details
  6. Copy the full SHA
    a503f5e View commit details
  7. [3.1.x] Added stub release notes for 3.1.2.

    Backport of 7a60670 from master
    carltongibson committed Sep 1, 2020
    Copy the full SHA
    2629882 View commit details
  8. [3.1.x] Added CVE-2020-24583 & CVE-2020-24584 to security archive.

    Backport of d5b526b from master
    carltongibson committed Sep 1, 2020
    Copy the full SHA
    63787b3 View commit details

Commits on Sep 2, 2020

  1. [3.1.x] Added "Bugfixes" section to release notes for 3.1.2.

    Backport of 76e0151 from master
    007gzs authored and felixxm committed Sep 2, 2020
    Copy the full SHA
    2610a39 View commit details
  2. [3.1.x] Refs #11390 -- Clarified dual-calling of ChoiceField.choices …

    …callable.
    
    Backport of 0bf627f from master
    carltongibson authored and felixxm committed Sep 2, 2020
    Copy the full SHA
    8178c4f View commit details
  3. [3.1.x] Fixed #31941 -- Corrected FileField.deconstruct() with a call…

    …able storage.
    
    Backport of 2d42e23 from master
    brianhelba authored and carltongibson committed Sep 2, 2020
    Copy the full SHA
    c69c688 View commit details
  4. [3.1.x] Refs #31901 -- Fixed SeleniumTests.test_list_editable_popups …

    …with headless mode.
    
    Backport of 6a88119 from master
    felixxm committed Sep 2, 2020
    Copy the full SHA
    17d5b16 View commit details

Commits on Sep 3, 2020

  1. [3.1.x] Refs #31224 -- Made sync_to_async() examples use thread sensi…

    …tive with ORM calls.
    
    Backport of 8d59075 from master
    felixxm authored and carltongibson committed Sep 3, 2020
    Copy the full SHA
    f36c441 View commit details
Showing 439 changed files with 4,378 additions and 1,977 deletions.
3 changes: 3 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -144,6 +144,7 @@ answer newbie questions, and generally made Django that much better:
Brian Beck <http://blog.brianbeck.com/>
Brian Fabian Crain <http://www.bfc.do/>
Brian Harring <ferringb@gmail.com>
Brian Helba <brian.helba@kitware.com>
Brian Ray <http://brianray.chipy.org/>
Brian Rosner <brosner@gmail.com>
Bruce Kroeze <https://coderseye.com/>
@@ -614,6 +615,7 @@ answer newbie questions, and generally made Django that much better:
mattycakes@gmail.com
Max Burstein <http://maxburstein.com>
Max Derkachev <mderk@yandex.ru>
Max Smolens <msmolens@gmail.com>
Maxime Lorant <maxime.lorant@gmail.com>
Maxime Turcotte <maxocub@riseup.net>
Maximilian Merz <django@mxmerz.de>
@@ -739,6 +741,7 @@ answer newbie questions, and generally made Django that much better:
Priyansh Saxena <askpriyansh@gmail.com>
Przemysław Buczkowski <przemub@przemub.pl>
Przemysław Suliga <http://suligap.net>
Qi Zhao <zhaoqi99@outlook.com>
Rachel Tobin <rmtobin@me.com>
Rachel Willmer <http://www.willmer.com/kb/>
Radek Švarz <https://www.svarz.cz/translate/>
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
@@ -29,8 +29,8 @@ ticket here: https://code.djangoproject.com/newticket

To get more help:

* Join the ``#django`` channel on irc.freenode.net. Lots of helpful people hang
out there. See https://freenode.net/kb/answer/chat if you're new to IRC.
* Join the ``#django`` channel on ``irc.libera.chat``. Lots of helpful people
hang out there.

* Join the django-users mailing list, or read the archives, at
https://groups.google.com/group/django-users.
2 changes: 1 addition & 1 deletion django/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.utils.version import get_version

VERSION = (3, 1, 0, 'final', 0)
VERSION = (3, 1, 13, 'final', 0)

__version__ = get_version(VERSION)

1 change: 1 addition & 0 deletions django/apps/registry.py
Original file line number Diff line number Diff line change
@@ -128,6 +128,7 @@ def check_apps_ready(self):
"""Raise an exception if all apps haven't been imported yet."""
if not self.apps_ready:
from django.conf import settings

# If "not ready" is due to unconfigured settings, accessing
# INSTALLED_APPS raises a more helpful ImproperlyConfigured
# exception.
13 changes: 3 additions & 10 deletions django/conf/__init__.py
Original file line number Diff line number Diff line change
@@ -15,8 +15,7 @@

import django
from django.conf import global_settings
from django.core.exceptions import ImproperlyConfigured, ValidationError
from django.core.validators import URLValidator
from django.core.exceptions import ImproperlyConfigured
from django.utils.deprecation import RemovedInDjango40Warning
from django.utils.functional import LazyObject, empty

@@ -124,14 +123,8 @@ def _add_script_prefix(value):
Useful when the app is being served at a subpath and manually prefixing
subpath to STATIC_URL and MEDIA_URL in settings is inconvenient.
"""
# Don't apply prefix to valid URLs.
try:
URLValidator()(value)
return value
except (ValidationError, AttributeError):
pass
# Don't apply prefix to absolute paths.
if value.startswith('/'):
# Don't apply prefix to absolute paths and URLs.
if value.startswith(('http://', 'https://', '/')):
return value
from django.urls import get_script_prefix
return '%s%s' % (get_script_prefix(), value)
2 changes: 1 addition & 1 deletion django/conf/global_settings.py
Original file line number Diff line number Diff line change
@@ -470,7 +470,7 @@ def gettext_noop(s):
# Whether to use the HttpOnly flag.
SESSION_COOKIE_HTTPONLY = True
# Whether to set the flag restricting cookie leaks on cross-site requests.
# This can be 'Lax', 'Strict', or None to disable the flag.
# This can be 'Lax', 'Strict', 'None', or False to disable the flag.
SESSION_COOKIE_SAMESITE = 'Lax'
# Whether to save the session data on every request.
SESSION_SAVE_EVERY_REQUEST = False
Binary file modified django/conf/locale/es/LC_MESSAGES/django.mo
Binary file not shown.
Loading