Skip to content

fix(django): Upgrade to 5.2#12524

Merged
mtesauro merged 9 commits intoDefectDojo:devfrom
kiblik:django_5.2
Dec 15, 2025
Merged

fix(django): Upgrade to 5.2#12524
mtesauro merged 9 commits intoDefectDojo:devfrom
kiblik:django_5.2

Conversation

@kiblik
Copy link
Copy Markdown
Contributor

@kiblik kiblik commented May 28, 2025 •
edited
Loading

Upgrade to the latest TLS (support of 5.1 ended December 3, 2025).

@kiblik
Copy link
Copy Markdown
Contributor Author

kiblik commented May 30, 2025

Waiting for a fix: radiac/django-tagulous#187 + radiac/django-tagulous#188

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Jun 20, 2025

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Aug 17, 2025

Conflicts have been resolved. A maintainer will review the pull request shortly.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Sep 15, 2025

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Sep 15, 2025

Conflicts have been resolved. A maintainer will review the pull request shortly.

@kiblik kiblik mentioned this pull request Oct 9, 2025
Draft
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Oct 14, 2025

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Nov 29, 2025

Conflicts have been resolved. A maintainer will review the pull request shortly.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Nov 29, 2025

Conflicts have been resolved. A maintainer will review the pull request shortly.

@valentijnscholten
Copy link
Copy Markdown
Member

valentijnscholten commented Nov 29, 2025

@kiblik The fix for django-tagoulus may not arrive in time. And we need a fix based on 2.1.0 as 2.1.1 has a bug showing tags twice. I went ahead and create a fix in my fork and added it to the PR here.

@valentijnscholten valentijnscholten added this to the 2.54.0 milestone Nov 29, 2025
@valentijnscholten valentijnscholten marked this pull request as ready for review December 7, 2025 09:35
@valentijnscholten
Copy link
Copy Markdown
Member

valentijnscholten commented Dec 7, 2025

Published this as we want to get it reviewed and merged before the xmas holiday starts.

kiblik
kiblik commented Dec 8, 2025
View reviewed changes
Comment thread requirements.txt
kiblik

This comment was marked as off-topic.

Sign in to view

@kiblik
Copy link
Copy Markdown
Contributor Author

kiblik commented Dec 8, 2025

I'm not able to add an approval (because PR/commits is mine), but it looks good to me.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Dec 8, 2025

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Dec 8, 2025

Conflicts have been resolved. A maintainer will review the pull request shortly.

mtesauro
mtesauro approved these changes Dec 15, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@mtesauro mtesauro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved

@mtesauro mtesauro merged commit 2242329 into DefectDojo:dev Dec 15, 2025
149 of 150 checks passed
@kiblik kiblik deleted the django_5.2 branch December 15, 2025 08:31
Maffooch pushed a commit to valentijnscholten/django-DefectDojo that referenced this pull request Feb 16, 2026
@kiblik @valentijnscholten
fix(django): Upgrade to 5.2 (DefectDojo#12524)
9adaf2d 
* fix(django): Upgrade to 5.2

* update deps + fix tagulous

* resolve conflicts

* use django 5.2 but against tagulous 2.1.0

* Latest Django patch

---------

Co-authored-by: Valentijn Scholten <valentijnscholten@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mtesauro mtesauro mtesauro approved these changes

@valentijnscholten valentijnscholten valentijnscholten approved these changes

@Maffooch Maffooch Maffooch approved these changes

@Jino-T Jino-T Jino-T approved these changes

@blakeaowens blakeaowens blakeaowens approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

2.54.0

Development

Successfully merging this pull request may close these issues.

6 participants

@kiblik @valentijnscholten @mtesauro @Maffooch @Jino-T @blakeaowens