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: 4.2.20
Choose a base ref
...
head repository: django/django
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4.2.21
Choose a head ref
  • 16 commits
  • 29 files changed
  • 7 contributors

Commits on Mar 6, 2025

  1. Configuration menu
    Copy the full SHA
    6d3f4c1 View commit details
    Browse the repository at this point in the history
  2. [4.2.x] Added CVE-2025-26699 to security archive.

    Backport of bad1a18 from main.
    sarahboyce committed Mar 6, 2025
    Configuration menu
    Copy the full SHA
    506cf74 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2025

  1. [4.2.x] Fixed #36298 -- Truncated the overwritten file content in fil…

    …e_move_safe().
    
    Regression in 58cd490.
    
    Thanks Baptiste Mispelon for the report.
    
    Backport of 8ad3e80 from main.
    sarahboyce committed Apr 7, 2025
    Configuration menu
    Copy the full SHA
    318c16d View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2025

  1. Configuration menu
    Copy the full SHA
    d5db532 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    24eeba2 View commit details
    Browse the repository at this point in the history
  3. [4.2.x] Upgraded to Python 3.12, Ubuntu 24.04, and enabled fail_on_wa…

    …rning for docs builds.
    
    Backport of 73d532d from main.
    smithdc1 authored and nessita committed Apr 23, 2025
    Configuration menu
    Copy the full SHA
    07edc97 View commit details
    Browse the repository at this point in the history
  4. [4.2.x] Fixed #36341 -- Preserved whitespaces in wordwrap template fi…

    …lter.
    
    Regression in 55d89e2.
    
    This work improves the django.utils.text.wrap() function to ensure that
    empty lines and lines with whitespace only are kept instead of being
    dropped.
    
    Thanks Matti Pohjanvirta for the report and fix.
    
    Co-authored-by: Natalia <124304+nessita@users.noreply.github.com>
    
    Backport of 1e9db35 from main.
    Grrandi authored and nessita committed Apr 23, 2025
    Configuration menu
    Copy the full SHA
    e61e3da View commit details
    Browse the repository at this point in the history
  5. [4.2.x] Refs #36341 -- Added release note for 4.2.21 for fix in wordw…

    …rap template filter.
    
    Revision 1e9db35 fixed a regression in
    55d89e2, which also needs to be
    backported to the stable branches in extended support.
    
    Backport of c86242d from main.
    nessita committed Apr 23, 2025
    Configuration menu
    Copy the full SHA
    b3df753 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2025

  1. [4.2.x] Added upcoming security release to release notes.

    Backport of 0f5dd0d from main.
    nessita committed Apr 30, 2025
    Configuration menu
    Copy the full SHA
    93973d4 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2025

  1. [4.2.x] Removed obsolete rpm-related install code.

    Backport of edcf853 from main.
    claudep authored and nessita committed May 5, 2025
    Configuration menu
    Copy the full SHA
    35c34ed View commit details
    Browse the repository at this point in the history
  2. [4.2.x] Migrated setuptools configuration to pyproject.toml.

    This branch migrates setuptools configuration from setup.py/setup.cfg to
    pyproject.toml. In order to ensure that the generated binary files have
    consistent casing (both the tarball and the wheel), setuptools version
    is limited to ">=61.0.0,<69.3.0".
    
    Configuration for flake8 was moved to a dedicated .flake8 file since
    it cannot be configured via pyproject.toml.
    
    Also, __pycache__ exclusion was removed from MANIFEST and the
    extras/Makefile was replaced with a simpler build command.
    
    Co-authored-by: Nick Pope <nick@nickpope.me.uk>
    
    Backport of 4686541 from main.
    claudep authored and nessita committed May 5, 2025
    Configuration menu
    Copy the full SHA
    afe52d8 View commit details
    Browse the repository at this point in the history
  3. [4.2.x] Fixed #35980 -- Updated setuptools to normalize package names…

    … in built artifacts.
    
    Backport of 3ae049b from main.
    ngnpope authored and nessita committed May 5, 2025
    Configuration menu
    Copy the full SHA
    3456eee View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f4bd564 View commit details
    Browse the repository at this point in the history
  5. [4.2.x] Changed packing recommendation to use pyproject.toml in reusa…

    …ble apps docs.
    
    Backport of f71bcc0 from main.
    claudep authored and nessita committed May 5, 2025
    Configuration menu
    Copy the full SHA
    ca31ca0 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2025

  1. [4.2.x] Fixed CVE-2025-32873 -- Mitigated potential DoS in strip_tags().

    Thanks to Elias Myllymäki for the report, and Shai Berger and Jake
    Howard for the reviews.
    
    Co-authored-by: Natalia <124304+nessita@users.noreply.github.com>
    
    Backport of 9f3419b from main.
    sarahboyce authored and nessita committed May 7, 2025
    Configuration menu
    Copy the full SHA
    9cd8028 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    87175d2 View commit details
    Browse the repository at this point in the history
Loading