From 0829af710384f463f5a994f7e7e09a25643c1ecb Mon Sep 17 00:00:00 2001 From: DefectDojo release bot Date: Mon, 27 Nov 2023 19:08:21 +0000 Subject: [PATCH 1/4] 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 b5f287e2ac..c304d69941 100644 --- a/components/package.json +++ b/components/package.json @@ -1,6 +1,6 @@ { "name": "defectdojo", - "version": "2.28.3", + "version": "2.29.0-dev", "license" : "BSD-3-Clause", "private": true, "dependencies": { diff --git a/dojo/__init__.py b/dojo/__init__.py index 07375eeed2..b03e47f8ef 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.28.3' +__version__ = '2.29.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 1f46e58bfc..0d1b3b8bea 100644 --- a/helm/defectdojo/Chart.yaml +++ b/helm/defectdojo/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "2.28.3" +appVersion: "2.29.0-dev" description: A Helm chart for Kubernetes to install DefectDojo name: defectdojo -version: 1.6.97 +version: 1.6.98-dev icon: https://www.defectdojo.org/img/favicon.ico maintainers: - name: madchap From 09c3fcc47b0ad9e496aa28f8d91be107c3f4431c Mon Sep 17 00:00:00 2001 From: DefectDojo release bot Date: Mon, 4 Dec 2023 16:22:58 +0000 Subject: [PATCH 2/4] 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 c239d4ca0f..11074eb8c4 100644 --- a/components/package.json +++ b/components/package.json @@ -1,6 +1,6 @@ { "name": "defectdojo", - "version": "2.29.0", + "version": "2.30.0-dev", "license" : "BSD-3-Clause", "private": true, "dependencies": { diff --git a/dojo/__init__.py b/dojo/__init__.py index aaecda9d7c..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.0' +__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 dd5b17e75b..c5edd40196 100644 --- a/helm/defectdojo/Chart.yaml +++ b/helm/defectdojo/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "2.29.0" +appVersion: "2.30.0-dev" description: A Helm chart for Kubernetes to install DefectDojo name: defectdojo -version: 1.6.98 +version: 1.6.99-dev icon: https://www.defectdojo.org/img/favicon.ico maintainers: - name: madchap From 7e1bb1e71732504c34ba0c68439dd2cf4325e103 Mon Sep 17 00:00:00 2001 From: Cody Maffucci <46459665+Maffooch@users.noreply.github.com> Date: Mon, 4 Dec 2023 12:17:23 -0600 Subject: [PATCH 3/4] Correct SLA filter for Finding API (#9101) --- dojo/filters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dojo/filters.py b/dojo/filters.py index 08198a6b79..6084e68e30 100644 --- a/dojo/filters.py +++ b/dojo/filters.py @@ -1247,7 +1247,7 @@ class ApiFindingFilter(DojoFilter): help_text='Comma separated list of exact tags not present on product', exclude='True') has_tags = BooleanFilter(field_name='tags', lookup_expr='isnull', exclude=True, label='Has tags') - outside_of_sla = extend_schema_field(OpenApiTypes.NUMBER)(ProductSLAFilter()) + outside_of_sla = extend_schema_field(OpenApiTypes.NUMBER)(FindingSLAFilter()) o = OrderingFilter( # tuple-mapping retains order From 9385c271e5fa1a47975944bddbab8aaff1b9129b Mon Sep 17 00:00:00 2001 From: DefectDojo release bot Date: Mon, 4 Dec 2023 18:26:50 +0000 Subject: [PATCH 4/4] 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..04a9af0e46 100644 --- a/components/package.json +++ b/components/package.json @@ -1,6 +1,6 @@ { "name": "defectdojo", - "version": "2.30.0-dev", + "version": "2.29.1", "license" : "BSD-3-Clause", "private": true, "dependencies": { diff --git a/dojo/__init__.py b/dojo/__init__.py index 1f645a4379..c11e60edd3 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.1' __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 c5edd40196..0579386f00 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.1" description: A Helm chart for Kubernetes to install DefectDojo name: defectdojo -version: 1.6.99-dev +version: 1.6.99 icon: https://www.defectdojo.org/img/favicon.ico maintainers: - name: madchap