From b3498c27f2205fd61412d4243021db28770db8ea Mon Sep 17 00:00:00 2001 From: valentijnscholten Date: Wed, 25 Feb 2026 17:17:07 +0100 Subject: [PATCH 1/5] Fix update-sample-data workflow pushing to protected master branch (#14374) The branch parameter used github.ref_name which resolved to 'master' when triggered via workflow_dispatch, causing a push to a protected branch. Simplify by letting create-pull-request manage the branch using a fixed name, removing the now-redundant manual branch steps. --- .github/workflows/update-sample-data.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/update-sample-data.yml b/.github/workflows/update-sample-data.yml index 8164ec51803..1423c154e15 100644 --- a/.github/workflows/update-sample-data.yml +++ b/.github/workflows/update-sample-data.yml @@ -30,24 +30,12 @@ jobs: git config --global user.name "${{ env.GIT_USERNAME }}" git config --global user.email "${{ env.GIT_EMAIL }}" - - name: Create and switch to a new branch - run: | - git checkout -b update-file-$(date +%Y%m%d%H%M%S) - git add dojo/fixtures/defect_dojo_sample_data.json - git commit -m "Update sample data" - - - name: Push branch - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - git push --set-upstream origin $(git rev-parse --abbrev-ref HEAD) - - name: Create Pull Request uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0 with: token: ${{ secrets.GITHUB_TOKEN }} commit-message: "Update sample data" - branch: ${{ github.ref_name || 'dev'}} + branch: update-sample-data base: dev title: "Update sample data" body: "This pull request updates the sample data." \ No newline at end of file From 3b20e9fb33782950e1d8f7943eeedcf3730f52d0 Mon Sep 17 00:00:00 2001 From: valentijnscholten Date: Thu, 26 Feb 2026 20:10:06 +0100 Subject: [PATCH 2/5] Also update defect_dojo_sample_data_locations.json in sample data workflow (#14391) The locations fixture is used when the v3 feature locations flag is enabled and needs to be kept up to date alongside the main sample data fixture. --- .github/workflows/update-sample-data.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/update-sample-data.yml b/.github/workflows/update-sample-data.yml index 1423c154e15..690477874e9 100644 --- a/.github/workflows/update-sample-data.yml +++ b/.github/workflows/update-sample-data.yml @@ -24,6 +24,8 @@ jobs: run: | ./fixture-updater dojo/fixtures/defect_dojo_sample_data.json mv output.json dojo/fixtures/defect_dojo_sample_data.json + ./fixture-updater dojo/fixtures/defect_dojo_sample_data_locations.json + mv output.json dojo/fixtures/defect_dojo_sample_data_locations.json - name: Configure git run: | From b5fa4249a7417bef1234ae7fdca75a4e81515046 Mon Sep 17 00:00:00 2001 From: valentijnscholten Date: Mon, 2 Mar 2026 06:27:26 +0100 Subject: [PATCH 3/5] fix: improve update-sample-data workflow (#14401) Rename job from run-binary-and-create-pr to run-script-and-create-pr to better reflect what the step does, and update the PR body to describe that the workflow updates timestamps in the sample data. --- .github/workflows/update-sample-data.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-sample-data.yml b/.github/workflows/update-sample-data.yml index 690477874e9..c172a729e91 100644 --- a/.github/workflows/update-sample-data.yml +++ b/.github/workflows/update-sample-data.yml @@ -11,7 +11,7 @@ on: - cron: '0 0 1 1,4,7,10 *' jobs: - run-binary-and-create-pr: + run-script-and-create-pr: runs-on: ubuntu-latest steps: # Checkout the repository @@ -40,4 +40,4 @@ jobs: branch: update-sample-data base: dev title: "Update sample data" - body: "This pull request updates the sample data." \ No newline at end of file + body: "This pull request updates the timestamps in the sample data to keep them up to date." \ No newline at end of file From d5ee7ceb32868b78dbd65db40a8a5fb2c87ae9fe Mon Sep 17 00:00:00 2001 From: DefectDojo release bot Date: Mon, 2 Mar 2026 18:06:34 +0000 Subject: [PATCH 4/5] Update versions in application files --- components/package.json | 2 +- dojo/__init__.py | 2 +- helm/defectdojo/Chart.yaml | 8 ++++---- helm/defectdojo/README.md | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/package.json b/components/package.json index 5152d3cc8af..9e675a7bb33 100644 --- a/components/package.json +++ b/components/package.json @@ -1,6 +1,6 @@ { "name": "defectdojo", - "version": "2.56.0-dev", + "version": "2.56.0", "license" : "BSD-3-Clause", "private": true, "dependencies": { diff --git a/dojo/__init__.py b/dojo/__init__.py index 700d8de3c7e..b761174d491 100644 --- a/dojo/__init__.py +++ b/dojo/__init__.py @@ -4,6 +4,6 @@ # Django starts so that shared_task will use this app. from .celery import app as celery_app # noqa: F401 -__version__ = "2.56.0-dev" +__version__ = "2.56.0" __url__ = "https://github.com/DefectDojo/django-DefectDojo" # noqa: RUF067 __docs__ = "https://documentation.defectdojo.com" # noqa: RUF067 diff --git a/helm/defectdojo/Chart.yaml b/helm/defectdojo/Chart.yaml index c3bf5276222..acd7421c581 100644 --- a/helm/defectdojo/Chart.yaml +++ b/helm/defectdojo/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "2.56.0-dev" +appVersion: "2.56.0" description: A Helm chart for Kubernetes to install DefectDojo name: defectdojo -version: 1.9.15-dev +version: 1.9.15 icon: https://defectdojo.com/hubfs/DefectDojo_favicon.png maintainers: - name: madchap @@ -33,5 +33,5 @@ dependencies: # - kind: security # description: Critical bug annotations: - artifacthub.io/prerelease: "true" - artifacthub.io/changes: "" + artifacthub.io/prerelease: "false" + artifacthub.io/changes: "- kind: changed\n description: Bump DefectDojo to 2.56.0\n" diff --git a/helm/defectdojo/README.md b/helm/defectdojo/README.md index bc048119b2c..4480125d96d 100644 --- a/helm/defectdojo/README.md +++ b/helm/defectdojo/README.md @@ -511,7 +511,7 @@ The HELM schema will be generated for you. # General information about chart values -![Version: 1.9.15-dev](https://img.shields.io/badge/Version-1.9.15--dev-informational?style=flat-square) ![AppVersion: 2.56.0-dev](https://img.shields.io/badge/AppVersion-2.56.0--dev-informational?style=flat-square) +![Version: 1.9.15](https://img.shields.io/badge/Version-1.9.15-informational?style=flat-square) ![AppVersion: 2.56.0](https://img.shields.io/badge/AppVersion-2.56.0-informational?style=flat-square) A Helm chart for Kubernetes to install DefectDojo From 3b649d2b3a117a0e5e7ba15827ddd43cf433fd5f Mon Sep 17 00:00:00 2001 From: DefectDojo release bot Date: Mon, 2 Mar 2026 19:14:59 +0000 Subject: [PATCH 5/5] Update versions in application files --- components/package.json | 2 +- docs/content/en/open_source/upgrading/2.57.md | 7 +++++++ dojo/__init__.py | 2 +- helm/defectdojo/Chart.yaml | 8 ++++---- helm/defectdojo/README.md | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 docs/content/en/open_source/upgrading/2.57.md diff --git a/components/package.json b/components/package.json index 9e675a7bb33..4d68c53285c 100644 --- a/components/package.json +++ b/components/package.json @@ -1,6 +1,6 @@ { "name": "defectdojo", - "version": "2.56.0", + "version": "2.57.0-dev", "license" : "BSD-3-Clause", "private": true, "dependencies": { diff --git a/docs/content/en/open_source/upgrading/2.57.md b/docs/content/en/open_source/upgrading/2.57.md new file mode 100644 index 00000000000..aeb39538930 --- /dev/null +++ b/docs/content/en/open_source/upgrading/2.57.md @@ -0,0 +1,7 @@ +--- +title: 'Upgrading to DefectDojo Version 2.57.x' +toc_hide: true +weight: -20260302 +description: No special instructions. +--- +There are no special instructions for upgrading to 2.57.x. Check the [Release Notes](https://github.com/DefectDojo/django-DefectDojo/releases/tag/2.57.0) for the contents of the release. diff --git a/dojo/__init__.py b/dojo/__init__.py index b761174d491..1318229d526 100644 --- a/dojo/__init__.py +++ b/dojo/__init__.py @@ -4,6 +4,6 @@ # Django starts so that shared_task will use this app. from .celery import app as celery_app # noqa: F401 -__version__ = "2.56.0" +__version__ = "2.57.0-dev" __url__ = "https://github.com/DefectDojo/django-DefectDojo" # noqa: RUF067 __docs__ = "https://documentation.defectdojo.com" # noqa: RUF067 diff --git a/helm/defectdojo/Chart.yaml b/helm/defectdojo/Chart.yaml index acd7421c581..c2e57f77c2c 100644 --- a/helm/defectdojo/Chart.yaml +++ b/helm/defectdojo/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "2.56.0" +appVersion: "2.57.0-dev" description: A Helm chart for Kubernetes to install DefectDojo name: defectdojo -version: 1.9.15 +version: 1.9.16-dev icon: https://defectdojo.com/hubfs/DefectDojo_favicon.png maintainers: - name: madchap @@ -33,5 +33,5 @@ dependencies: # - kind: security # description: Critical bug annotations: - artifacthub.io/prerelease: "false" - artifacthub.io/changes: "- kind: changed\n description: Bump DefectDojo to 2.56.0\n" + artifacthub.io/prerelease: "true" + artifacthub.io/changes: "" diff --git a/helm/defectdojo/README.md b/helm/defectdojo/README.md index 4480125d96d..0de04e2665d 100644 --- a/helm/defectdojo/README.md +++ b/helm/defectdojo/README.md @@ -511,7 +511,7 @@ The HELM schema will be generated for you. # General information about chart values -![Version: 1.9.15](https://img.shields.io/badge/Version-1.9.15-informational?style=flat-square) ![AppVersion: 2.56.0](https://img.shields.io/badge/AppVersion-2.56.0-informational?style=flat-square) +![Version: 1.9.16-dev](https://img.shields.io/badge/Version-1.9.16--dev-informational?style=flat-square) ![AppVersion: 2.57.0-dev](https://img.shields.io/badge/AppVersion-2.57.0--dev-informational?style=flat-square) A Helm chart for Kubernetes to install DefectDojo