From b4fc18929972dd19e19ad793d58eea70873cb9e3 Mon Sep 17 00:00:00 2001 From: DefectDojo release bot Date: Mon, 11 Dec 2023 17:20:33 +0000 Subject: [PATCH 1/5] Update versions in application files --- components/package.json | 2 +- dojo/__init__.py | 2 +- helm/defectdojo/Chart.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/package.json b/components/package.json index 9502198ca2..11074eb8c4 100644 --- a/components/package.json +++ b/components/package.json @@ -1,6 +1,6 @@ { "name": "defectdojo", - "version": "2.29.2", + "version": "2.30.0-dev", "license" : "BSD-3-Clause", "private": true, "dependencies": { diff --git a/dojo/__init__.py b/dojo/__init__.py index 2acef18517..1f645a4379 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 -__version__ = '2.29.2' +__version__ = '2.30.0-dev' __url__ = 'https://github.com/DefectDojo/django-DefectDojo' __docs__ = 'https://documentation.defectdojo.com' diff --git a/helm/defectdojo/Chart.yaml b/helm/defectdojo/Chart.yaml index abd0ffbd0d..2edb3234ac 100644 --- a/helm/defectdojo/Chart.yaml +++ b/helm/defectdojo/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "2.29.2" +appVersion: "2.30.0-dev" description: A Helm chart for Kubernetes to install DefectDojo name: defectdojo -version: 1.6.100 +version: 1.6.101-dev icon: https://www.defectdojo.org/img/favicon.ico maintainers: - name: madchap From 430adf5d14fb8063ca27ab1ae5fd699da8b673bf Mon Sep 17 00:00:00 2001 From: WojTecH94 Date: Wed, 13 Dec 2023 19:00:10 +0100 Subject: [PATCH 2/5] Fix for vulnerabilities not included in host/endpoint views after reopening (#9077) Fix for vulnerabilities not included in host/endpoint views after reopening: https://github.com/DefectDojo/django-DefectDojo/issues/8450 --- dojo/models.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dojo/models.py b/dojo/models.py index e65bba0510..a46b6da0c0 100755 --- a/dojo/models.py +++ b/dojo/models.py @@ -1716,7 +1716,6 @@ def active_findings(self): mitigated__isnull=True, false_p=False, duplicate=False, - status_finding__mitigated=False, status_finding__false_positive=False, status_finding__out_of_scope=False, status_finding__risk_accepted=False @@ -1731,7 +1730,6 @@ def active_verified_findings(self): mitigated__isnull=True, false_p=False, duplicate=False, - status_finding__mitigated=False, status_finding__false_positive=False, status_finding__out_of_scope=False, status_finding__risk_accepted=False @@ -1786,7 +1784,6 @@ def host_active_findings(self): mitigated__isnull=True, false_p=False, duplicate=False, - status_finding__mitigated=False, status_finding__false_positive=False, status_finding__out_of_scope=False, status_finding__risk_accepted=False, @@ -1802,7 +1799,6 @@ def host_active_verified_findings(self): mitigated__isnull=True, false_p=False, duplicate=False, - status_finding__mitigated=False, status_finding__false_positive=False, status_finding__out_of_scope=False, status_finding__risk_accepted=False, From 290f0ae822ff372e0d4dc6db17859a1669144235 Mon Sep 17 00:00:00 2001 From: kiblik Date: Mon, 18 Dec 2023 15:18:44 +0100 Subject: [PATCH 3/5] Docs: "Create upgrade notes to documentation" only once (#9146) --- .github/workflows/release-3-master-into-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-3-master-into-dev.yml b/.github/workflows/release-3-master-into-dev.yml index 465a8fc2e9..241fdbdfa9 100644 --- a/.github/workflows/release-3-master-into-dev.yml +++ b/.github/workflows/release-3-master-into-dev.yml @@ -70,7 +70,7 @@ jobs: There are no special instructions for upgrading to $minorv.x. Check the [Release Notes](https://github.com/DefectDojo/django-DefectDojo/releases/tag/$patchv) for the contents of the release. " > docs/content/en/getting_started/upgrading/$minorv.md git add docs/content/en/getting_started/upgrading/$minorv.md - if: endsWith(github.event.inputs.release_number_dev, '.0-dev') + if: endsWith(github.event.inputs.release_number_new, '.0') && endsWith(github.event.inputs.release_number_dev, '.0-dev') - name: Push version changes uses: stefanzweifel/git-auto-commit-action@v5.0.0 From 5d3e9af75dba029921f31b0b8e53e7f59d617d6d Mon Sep 17 00:00:00 2001 From: Cody Maffucci <46459665+Maffooch@users.noreply.github.com> Date: Mon, 18 Dec 2023 08:44:35 -0600 Subject: [PATCH 4/5] Revert "Fix for vulnerabilities not included in host/endpoint views after reopening (#9077)" (#9181) This reverts commit 430adf5d14fb8063ca27ab1ae5fd699da8b673bf. --- dojo/models.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dojo/models.py b/dojo/models.py index a46b6da0c0..e65bba0510 100755 --- a/dojo/models.py +++ b/dojo/models.py @@ -1716,6 +1716,7 @@ def active_findings(self): mitigated__isnull=True, false_p=False, duplicate=False, + status_finding__mitigated=False, status_finding__false_positive=False, status_finding__out_of_scope=False, status_finding__risk_accepted=False @@ -1730,6 +1731,7 @@ def active_verified_findings(self): mitigated__isnull=True, false_p=False, duplicate=False, + status_finding__mitigated=False, status_finding__false_positive=False, status_finding__out_of_scope=False, status_finding__risk_accepted=False @@ -1784,6 +1786,7 @@ def host_active_findings(self): mitigated__isnull=True, false_p=False, duplicate=False, + status_finding__mitigated=False, status_finding__false_positive=False, status_finding__out_of_scope=False, status_finding__risk_accepted=False, @@ -1799,6 +1802,7 @@ def host_active_verified_findings(self): mitigated__isnull=True, false_p=False, duplicate=False, + status_finding__mitigated=False, status_finding__false_positive=False, status_finding__out_of_scope=False, status_finding__risk_accepted=False, From 3179a17f861bff757e2a010e00e15a86e18a5555 Mon Sep 17 00:00:00 2001 From: DefectDojo release bot Date: Mon, 18 Dec 2023 14:45:47 +0000 Subject: [PATCH 5/5] Update versions in application files --- components/package.json | 2 +- dojo/__init__.py | 2 +- helm/defectdojo/Chart.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/package.json b/components/package.json index 11074eb8c4..e2ef62c229 100644 --- a/components/package.json +++ b/components/package.json @@ -1,6 +1,6 @@ { "name": "defectdojo", - "version": "2.30.0-dev", + "version": "2.29.3", "license" : "BSD-3-Clause", "private": true, "dependencies": { diff --git a/dojo/__init__.py b/dojo/__init__.py index 1f645a4379..7436433b30 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 -__version__ = '2.30.0-dev' +__version__ = '2.29.3' __url__ = 'https://github.com/DefectDojo/django-DefectDojo' __docs__ = 'https://documentation.defectdojo.com' diff --git a/helm/defectdojo/Chart.yaml b/helm/defectdojo/Chart.yaml index 2edb3234ac..218f662078 100644 --- a/helm/defectdojo/Chart.yaml +++ b/helm/defectdojo/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "2.30.0-dev" +appVersion: "2.29.3" description: A Helm chart for Kubernetes to install DefectDojo name: defectdojo -version: 1.6.101-dev +version: 1.6.101 icon: https://www.defectdojo.org/img/favicon.ico maintainers: - name: madchap