From 76a59c9e8c7f3e5128d1174696fa402ef58931b4 Mon Sep 17 00:00:00 2001 From: Sarah Boyce <42296566+sarahboyce@users.noreply.github.com> Date: Wed, 6 May 2026 12:46:36 +0200 Subject: [checklists] Improved code block formatting. --- .../templates/checklists/_stub_release_notes.md | 4 ++-- .../checklists/_update_security_archive.md | 4 ++-- .../templates/checklists/checklist_detail.html | 7 +++++- .../checklists/release-security-skeleton.md | 26 +++++++++++----------- checklists/views.py | 1 + 5 files changed, 24 insertions(+), 18 deletions(-) diff --git a/checklists/templates/checklists/_stub_release_notes.md b/checklists/templates/checklists/_stub_release_notes.md index f7beb6d2..46b73f56 100644 --- a/checklists/templates/checklists/_stub_release_notes.md +++ b/checklists/templates/checklists/_stub_release_notes.md @@ -22,8 +22,8 @@ Bugfixes ``` - - In an environment with django branch and docs dependencies installed: - - `cd docs && make html check` +- Then, in an environment with django branch and docs dependencies installed: + - `cd docs && make html check` - Check local docs: - `firefox docs/_build/html/releases/index.html` diff --git a/checklists/templates/checklists/_update_security_archive.md b/checklists/templates/checklists/_update_security_archive.md index be7b3c67..f46e56c9 100644 --- a/checklists/templates/checklists/_update_security_archive.md +++ b/checklists/templates/checklists/_update_security_archive.md @@ -8,8 +8,8 @@ {% include 'checklists/release_security_archive.rst' %} ``` - - In an environment with django branch and docs dependencies installed: - - `cd docs && make html check` +- Then, in an environment with django branch and docs dependencies installed: + - `cd docs && make html check` - Check local docs: - `firefox docs/_build/html/releases/security.html` diff --git a/checklists/templates/checklists/checklist_detail.html b/checklists/templates/checklists/checklist_detail.html index f939c043..326a5620 100644 --- a/checklists/templates/checklists/checklist_detail.html +++ b/checklists/templates/checklists/checklist_detail.html @@ -3,13 +3,18 @@ Django {{ instance }} Checklist +
{{ markdown|safe }}
-
+

Raw Markdown

Open diff --git a/checklists/templates/checklists/release-security-skeleton.md b/checklists/templates/checklists/release-security-skeleton.md index a48f690e..8fa4a0d3 100644 --- a/checklists/templates/checklists/release-security-skeleton.md +++ b/checklists/templates/checklists/release-security-skeleton.md @@ -79,24 +79,24 @@ ``` {% include "checklists/release-security-prenotification.md" %} ``` - - GPG sign that new file: - - `gpg --clearsign --digest-algo SHA256 prenotification-email.txt` +- GPG sign that new file: + - `gpg --clearsign --digest-algo SHA256 prenotification-email.txt` - Send an email with body using the signed content to a given list of special users: - Attach patches. - USE BCC!: https://github.com/django/django-security/wiki/Security-Release-Prenotification-Email-List - [ ] Post announcement in mailing list (without details in django-announce): - ``` - Django versions {{ versions|enumerate_items }} will be released on - {{ instance.when|utc|date:"l, F j" }} around {{ instance.when|utc|date:"H:i" }} UTC. - {% if cves_length == 1 %} - They will fix one security defect with severity "{{ cves.0.severity }}". - {% else %} - They will fix {{ cves_length }} security defects with severities: {{ cves|enumerate_cves:"severity" }}. - {% endif %} - For details of severity levels, see: - https://docs.djangoproject.com/en/dev/internals/security/#security-issue-severity-levels - ``` +``` +Django versions {{ versions|enumerate_items }} will be released on +{{ instance.when|utc|date:"l, F j" }} around {{ instance.when|utc|date:"H:i" }} UTC. +{% if cves_length == 1 %} +They will fix one security defect with severity "{{ cves.0.severity }}". +{% else %} +They will fix {{ cves_length }} security defects with severities: {{ cves|enumerate_cves:"severity" }}. +{% endif %} +For details of severity levels, see: +https://docs.djangoproject.com/en/dev/internals/security/#security-issue-severity-levels +``` - [ ] Land the stub release notes and release date updates in {{ instance.affected_branches|enumerate_items }} diff --git a/checklists/views.py b/checklists/views.py index e5e7ed88..b7fa6b0a 100644 --- a/checklists/views.py +++ b/checklists/views.py @@ -26,6 +26,7 @@ def render_checklist(request, instance): "pymdownx.tasklist", "pymdownx.superfences", "pymdownx.magiclink", + "markdown.extensions.fenced_code", ], extension_configs={ "pymdownx.tasklist": { -- cgit v1.3