Merge pull request #15231 from DefectDojo/master-into-bugfix/3.1.100-3.2.0-dev

Release: Merge back 3.1.100 into bugfix from: master-into-bugfix/3.1.100-3.2.0-dev

Author: rossops

.github/CODEOWNERS

@@ -1,19 +1,4 @@
-# Any kind of package updates only need 2 approvals,
-# So let's add three folks here
-requirements.txt @cneill @mtesauro @Maffooch
-# Any dockerfile or compose changes will need to be viewed by
-# these people
-Dockerfile.* @mtesauro @Maffooch 
-docker-compose.* @mtesauro @Maffooch 
-/docker/ @mtesauro @Maffooch 
 # Documentation changes 
-/docs/content/ @paulOsinski @valentijnscholten @Maffooch
-# Kubernetes should be reviewed by reviewed first by those that know it
-/helm/ @cneill @kiblik @Maffooch
-# Anything UI related needs to be checked out by those with the eye for it
-/dojo/static/ @blakeaowens @Maffooch
-/dojo/templates/ @blakeaowens @Maffooch
-# Any model changes should be closely looked at
-/dojo/models.py @Maffooch
+/docs/content/ @paulOsinski @Maffooch
 # All other code changes should be reviewed by someone
-* @Maffooch @mtesauro
+* @Maffooch @blakeaowens

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__ = "3.1.0"
+__version__ = "3.1.100"
 __url__ = "https://github.com/DefectDojo/django-DefectDojo"
 __docs__ = "https://documentation.defectdojo.com"

helm/defectdojo/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "3.2.0-dev"
 description: A Helm chart for Kubernetes to install DefectDojo
 name: defectdojo
-version: 1.9.36-dev
+version: 1.9.37-dev
 icon: https://defectdojo.com/hubfs/DefectDojo_favicon.png
 maintainers:
   - name: madchap

helm/defectdojo/README.md

@@ -511,7 +511,7 @@ The HELM schema will be generated for you.
 
 # General information about chart values
 
-![Version: 1.9.36-dev](https://img.shields.io/badge/Version-1.9.36--dev-informational?style=flat-square) ![AppVersion: 3.2.0-dev](https://img.shields.io/badge/AppVersion-3.2.0--dev-informational?style=flat-square)
+![Version: 1.9.37-dev](https://img.shields.io/badge/Version-1.9.37--dev-informational?style=flat-square) ![AppVersion: 3.2.0-dev](https://img.shields.io/badge/AppVersion-3.2.0--dev-informational?style=flat-square)
 
 A Helm chart for Kubernetes to install DefectDojo