Skip to content

Release: Merge back 2.54.3 into dev from: master-into-dev/2.54.3-2.55.0-dev#14169

Merged
rossops merged 12 commits intodevfrom
master-into-dev/2.54.3-2.55.0-dev
Jan 26, 2026
Merged

Release: Merge back 2.54.3 into dev from: master-into-dev/2.54.3-2.55.0-dev#14169
rossops merged 12 commits intodevfrom
master-into-dev/2.54.3-2.55.0-dev

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

Release triggered by rossops

DefectDojo release bot and others added 11 commits January 20, 2026 16:39
….55.0-dev

Release: Merge back 2.54.2 into bugfix from: master-into-bugfix/2.54.2-2.55.0-dev
* update changelog 2.54.1/2

* quick fix

Removed note about no significant UX changes from changelog.
🎉 add Trivy misconfiguration fields #14136
Release: Merge release into master from: release/2.54.3
@github-actions
Copy link
Copy Markdown
Contributor Author

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

@dryrunsecurity
Copy link
Copy Markdown

DryRun Security

🔴 Risk threshold exceeded.

This pull request includes a sensitive edit to dojo/forms.py (flagged by the scanner); sensitive file paths and allowed authors can be configured in .dryrunsecurity.yaml to adjust handling.

🔴 Configured Codepaths Edit in dojo/forms.py
Vulnerability Configured Codepaths Edit
Description Sensitive edits detected for this file. Sensitive file paths and allowed authors can be configured in .dryrunsecurity.yaml.

We've notified @mtesauro.


All finding details can be found in the DryRun Security Dashboard.

@github-actions
Copy link
Copy Markdown
Contributor Author

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

@github-actions github-actions Bot added settings_changes Needs changes to settings.py based on changes in settings.dist.py included in this PR docs unittests parser helm and removed conflicts-detected labels Jan 26, 2026
@rossops rossops merged commit dcb8c8c into dev Jan 26, 2026
92 checks passed
@rossops rossops deleted the master-into-dev/2.54.3-2.55.0-dev branch January 26, 2026 18:15
Maffooch pushed a commit to valentijnscholten/django-DefectDojo that referenced this pull request Feb 16, 2026
….54.3-2.55.0-dev

Release: Merge back 2.54.3 into dev from: master-into-dev/2.54.3-2.55.0-dev
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

docs helm parser settings_changes Needs changes to settings.py based on changes in settings.dist.py included in this PR unittests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants