Skip to content

[pull] main from django:main #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Jul 30, 2025
+4 −1
Merged

[pull] main from django:main #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65ab92f
Fixed writer_name deprecation warning in docutils 0.22+.
felixxm Jul 30, 2025
f96c8f0
Refs #36500 -- Ignored formatting changes in git blame.
nessita Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ c18861804feb6a97afbeabb51be748dd60a04458
534ac4829764f317cf2fbc4a18354fcc998c1425
ba755ca13123d2691a0926ddb64e5d0a2906a880
14459f80ee3a9e005989db37c26fd13bb6d2fab2
1ecf6889cabc9f3f60d3fdd651468cddd8f4da6e
69a93a88edb56ba47f624dac7a21aacc47ea474f
78298b51629e14c0e472898b635bc819d47b7f27
2 changes: 1 addition & 1 deletion django/contrib/admindocs/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def parse_rst(text, default_reference_context, thing_being_parsed=None):
source % text,
source_path=thing_being_parsed,
destination_path=None,
writer_name="html",
writer="html",
settings_overrides=overrides,
)
return mark_safe(parts["fragment"])
Expand Down