Release: Merge release into master from: release/3.3.200

components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "defectdojo",
-  "version": "3.3.100",
+  "version": "3.3.200",
   "license": "BSD-3-Clause",
   "private": true,
   "dependencies": {

docker-compose.override.unit_tests.yml

@@ -24,6 +24,13 @@ services:
       DD_CELERY_BROKER_URL: 'sqla+sqlite:///dojo.celerydb.sqlite'
       # No Redis/valkey in unit tests -> default django cache is LocMemCache.
       DD_CACHE_URL: ''
+      # Product grading is debounced through a cache marker with a wall-clock window
+      # (dojo.utils.schedule_product_grade). Under the test runner a dispatched grade task
+      # may never run, so a marker would outlive its test and silently skip grading for the
+      # next test whose product gets the same id, and it makes query counts depend on
+      # timing. 0 queues a task per change, as before; the debounce's own unit tests turn
+      # the window on explicitly.
+      DD_PRODUCT_GRADE_DEBOUNCE_SECONDS: '0'
       # In-process singleton cache (dojo/caching.py) stays ON for deterministic
       # assertNumQueries counts; reset per request (middleware) and per test.
       DD_SETTINGS_CACHE_L1_TTL: '30'

docker-compose.override.unit_tests_cicd.yml

@@ -43,6 +43,13 @@ services:
       DD_TEST_DB_MODE: ${DD_TEST_DB_MODE:-full}
       # No Redis/valkey in unit tests -> default django cache is LocMemCache.
       DD_CACHE_URL: ''
+      # Product grading is debounced through a cache marker with a wall-clock window
+      # (dojo.utils.schedule_product_grade). Under the test runner a dispatched grade task
+      # may never run, so a marker would outlive its test and silently skip grading for the
+      # next test whose product gets the same id, and it makes query counts depend on
+      # timing. 0 queues a task per change, as before; the debounce's own unit tests turn
+      # the window on explicitly.
+      DD_PRODUCT_GRADE_DEBOUNCE_SECONDS: '0'
       # In-process singleton cache (dojo/caching.py) stays ON: a singleton is read
       # once per request/test (deterministic assertNumQueries), reset per request
       # (middleware) and per test (dojo_test_case setUp).

docs/config/_default/menus/menus.de.toml

@@ -85,6 +85,27 @@
   pageRef = "/sensei/sensei_reference"
   weight = 4
 
+# Left-hand section sidebar for the Releases chapter (see menus.en.toml).
+[[sidebar_releases]]
+  name = "Open-Source-Upgrades"
+  pageRef = "/releases/os_upgrading"
+  weight = 0
+
+[[sidebar_releases]]
+  name = "Pro-Upgrades"
+  pageRef = "/releases/pro"
+  weight = 1
+
+[[sidebar_releases]]
+  name = "Upgrade auf Kubernetes (Helm)"
+  pageRef = "/get_started/pro/onprem/kubernetes/upgrading_on_kubernetes"
+  weight = 2
+
+[[sidebar_releases]]
+  name = "Upgrade auf Docker Compose"
+  pageRef = "/get_started/pro/onprem/docker_compose/upgrading_on_docker_compose"
+  weight = 3
+
 [[social]]
   name = "YouTube"
   pre = '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-youtube" viewBox="0 0 16 16"><path d="M8.051 1.999h.089c.822.003 4.987.033 6.11.335a2.01 2.01 0 0 1 1.415 1.42c.101.38.172.883.22 1.402l.01.104.022.26.008.104c.065.914.073 1.77.074 1.957v.075c-.001.194-.01 1.108-.082 2.06l-.008.105-.009.104c-.05.572-.124 1.14-.235 1.558a2.01 2.01 0 0 1-1.415 1.42c-1.16.312-5.569.334-6.18.335h-.142c-.309 0-1.587-.006-2.927-.052l-.17-.006-.087-.004-.171-.007-.171-.007c-1.11-.049-2.167-.128-2.654-.26a2.01 2.01 0 0 1-1.415-1.419c-.111-.417-.185-.986-.235-1.558L.09 9.82l-.008-.104A31 31 0 0 1 0 7.68v-.123c.002-.215.01-.958.064-1.778l.007-.103.003-.052.008-.104.022-.26.01-.104c.048-.519.119-1.023.22-1.402a2.01 2.01 0 0 1 1.415-1.42c.487-.13 1.544-.21 2.654-.26l.17-.007.172-.006.086-.003.171-.007A100 100 0 0 1 7.858 2zM6.4 5.209v4.818l4.157-2.408z"/></svg>'

docs/config/_default/menus/menus.en.toml

@@ -64,6 +64,31 @@
   pageRef = "/sensei/sensei_reference"
   weight = 4
 
+# Left-hand section sidebar for the Releases chapter. Defining this menu
+# replaces the auto-generated releases tree, so it reproduces the two release
+# groups (each auto-expands to its child pages) and then adds the two Pro
+# on-prem upgrade guides so they are discoverable from this panel too. Entries
+# are audience-filtered by the version toggle via each referenced page's audience.
+[[sidebar_releases]]
+  name = "Open Source Upgrades"
+  pageRef = "/releases/os_upgrading"
+  weight = 0
+
+[[sidebar_releases]]
+  name = "Pro Upgrades"
+  pageRef = "/releases/pro"
+  weight = 1
+
+[[sidebar_releases]]
+  name = "Upgrade on Kubernetes (Helm)"
+  pageRef = "/get_started/pro/onprem/kubernetes/upgrading_on_kubernetes"
+  weight = 2
+
+[[sidebar_releases]]
+  name = "Upgrade on Docker Compose"
+  pageRef = "/get_started/pro/onprem/docker_compose/upgrading_on_docker_compose"
+  weight = 3
+
 [[main]]
   name = "Admin"
   url = "/admin/admin_intro/intro/"

docs/config/_default/menus/menus.es.toml

@@ -79,6 +79,27 @@
   pageRef = "/sensei/sensei_reference"
   weight = 4
 
+# Left-hand section sidebar for the Releases chapter (see menus.en.toml).
+[[sidebar_releases]]
+  name = "Actualizaciones de código abierto"
+  pageRef = "/releases/os_upgrading"
+  weight = 0
+
+[[sidebar_releases]]
+  name = "Actualizaciones Pro"
+  pageRef = "/releases/pro"
+  weight = 1
+
+[[sidebar_releases]]
+  name = "Actualización en Kubernetes (Helm)"
+  pageRef = "/get_started/pro/onprem/kubernetes/upgrading_on_kubernetes"
+  weight = 2
+
+[[sidebar_releases]]
+  name = "Actualización en Docker Compose"
+  pageRef = "/get_started/pro/onprem/docker_compose/upgrading_on_docker_compose"
+  weight = 3
+
 [[social]]
   name = "YouTube"
   pre = '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-youtube" viewBox="0 0 16 16"><path d="M8.051 1.999h.089c.822.003 4.987.033 6.11.335a2.01 2.01 0 0 1 1.415 1.42c.101.38.172.883.22 1.402l.01.104.022.26.008.104c.065.914.073 1.77.074 1.957v.075c-.001.194-.01 1.108-.082 2.06l-.008.105-.009.104c-.05.572-.124 1.14-.235 1.558a2.01 2.01 0 0 1-1.415 1.42c-1.16.312-5.569.334-6.18.335h-.142c-.309 0-1.587-.006-2.927-.052l-.17-.006-.087-.004-.171-.007-.171-.007c-1.11-.049-2.167-.128-2.654-.26a2.01 2.01 0 0 1-1.415-1.419c-.111-.417-.185-.986-.235-1.558L.09 9.82l-.008-.104A31 31 0 0 1 0 7.68v-.123c.002-.215.01-.958.064-1.778l.007-.103.003-.052.008-.104.022-.26.01-.104c.048-.519.119-1.023.22-1.402a2.01 2.01 0 0 1 1.415-1.42c.487-.13 1.544-.21 2.654-.26l.17-.007.172-.006.086-.003.171-.007A100 100 0 0 1 7.858 2zM6.4 5.209v4.818l4.157-2.408z"/></svg>'

docs/config/_default/menus/menus.fr.toml

@@ -79,6 +79,27 @@
   pageRef = "/sensei/sensei_reference"
   weight = 4
 
+# Left-hand section sidebar for the Releases chapter (see menus.en.toml).
+[[sidebar_releases]]
+  name = "Mises à niveau Open Source"
+  pageRef = "/releases/os_upgrading"
+  weight = 0
+
+[[sidebar_releases]]
+  name = "Mises à niveau Pro"
+  pageRef = "/releases/pro"
+  weight = 1
+
+[[sidebar_releases]]
+  name = "Mise à niveau sur Kubernetes (Helm)"
+  pageRef = "/get_started/pro/onprem/kubernetes/upgrading_on_kubernetes"
+  weight = 2
+
+[[sidebar_releases]]
+  name = "Mise à niveau sur Docker Compose"
+  pageRef = "/get_started/pro/onprem/docker_compose/upgrading_on_docker_compose"
+  weight = 3
+
 [[social]]
   name = "YouTube"
   pre = '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-youtube" viewBox="0 0 16 16"><path d="M8.051 1.999h.089c.822.003 4.987.033 6.11.335a2.01 2.01 0 0 1 1.415 1.42c.101.38.172.883.22 1.402l.01.104.022.26.008.104c.065.914.073 1.77.074 1.957v.075c-.001.194-.01 1.108-.082 2.06l-.008.105-.009.104c-.05.572-.124 1.14-.235 1.558a2.01 2.01 0 0 1-1.415 1.42c-1.16.312-5.569.334-6.18.335h-.142c-.309 0-1.587-.006-2.927-.052l-.17-.006-.087-.004-.171-.007-.171-.007c-1.11-.049-2.167-.128-2.654-.26a2.01 2.01 0 0 1-1.415-1.419c-.111-.417-.185-.986-.235-1.558L.09 9.82l-.008-.104A31 31 0 0 1 0 7.68v-.123c.002-.215.01-.958.064-1.778l.007-.103.003-.052.008-.104.022-.26.01-.104c.048-.519.119-1.023.22-1.402a2.01 2.01 0 0 1 1.415-1.42c.487-.13 1.544-.21 2.654-.26l.17-.007.172-.006.086-.003.171-.007A100 100 0 0 1 7.858 2zM6.4 5.209v4.818l4.157-2.408z"/></svg>'

docs/config/_default/menus/menus.it.toml

@@ -79,6 +79,27 @@
   pageRef = "/sensei/sensei_reference"
   weight = 4
 
+# Left-hand section sidebar for the Releases chapter (see menus.en.toml).
+[[sidebar_releases]]
+  name = "Aggiornamenti Open Source"
+  pageRef = "/releases/os_upgrading"
+  weight = 0
+
+[[sidebar_releases]]
+  name = "Aggiornamenti Pro"
+  pageRef = "/releases/pro"
+  weight = 1
+
+[[sidebar_releases]]
+  name = "Aggiornamento su Kubernetes (Helm)"
+  pageRef = "/get_started/pro/onprem/kubernetes/upgrading_on_kubernetes"
+  weight = 2
+
+[[sidebar_releases]]
+  name = "Aggiornamento su Docker Compose"
+  pageRef = "/get_started/pro/onprem/docker_compose/upgrading_on_docker_compose"
+  weight = 3
+
 [[social]]
   name = "YouTube"
   pre = '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-youtube" viewBox="0 0 16 16"><path d="M8.051 1.999h.089c.822.003 4.987.033 6.11.335a2.01 2.01 0 0 1 1.415 1.42c.101.38.172.883.22 1.402l.01.104.022.26.008.104c.065.914.073 1.77.074 1.957v.075c-.001.194-.01 1.108-.082 2.06l-.008.105-.009.104c-.05.572-.124 1.14-.235 1.558a2.01 2.01 0 0 1-1.415 1.42c-1.16.312-5.569.334-6.18.335h-.142c-.309 0-1.587-.006-2.927-.052l-.17-.006-.087-.004-.171-.007-.171-.007c-1.11-.049-2.167-.128-2.654-.26a2.01 2.01 0 0 1-1.415-1.419c-.111-.417-.185-.986-.235-1.558L.09 9.82l-.008-.104A31 31 0 0 1 0 7.68v-.123c.002-.215.01-.958.064-1.778l.007-.103.003-.052.008-.104.022-.26.01-.104c.048-.519.119-1.023.22-1.402a2.01 2.01 0 0 1 1.415-1.42c.487-.13 1.544-.21 2.654-.26l.17-.007.172-.006.086-.003.171-.007A100 100 0 0 1 7.858 2zM6.4 5.209v4.818l4.157-2.408z"/></svg>'

docs/config/_default/menus/menus.ja.toml

@@ -79,6 +79,27 @@
   pageRef = "/sensei/sensei_reference"
   weight = 4
 
+# Left-hand section sidebar for the Releases chapter (see menus.en.toml).
+[[sidebar_releases]]
+  name = "オープンソースのアップグレード"
+  pageRef = "/releases/os_upgrading"
+  weight = 0
+
+[[sidebar_releases]]
+  name = "Pro のアップグレード"
+  pageRef = "/releases/pro"
+  weight = 1
+
+[[sidebar_releases]]
+  name = "Kubernetes（Helm）でのアップグレード"
+  pageRef = "/get_started/pro/onprem/kubernetes/upgrading_on_kubernetes"
+  weight = 2
+
+[[sidebar_releases]]
+  name = "Docker Compose でのアップグレード"
+  pageRef = "/get_started/pro/onprem/docker_compose/upgrading_on_docker_compose"
+  weight = 3
+
 [[social]]
   name = "YouTube"
   pre = '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-youtube" viewBox="0 0 16 16"><path d="M8.051 1.999h.089c.822.003 4.987.033 6.11.335a2.01 2.01 0 0 1 1.415 1.42c.101.38.172.883.22 1.402l.01.104.022.26.008.104c.065.914.073 1.77.074 1.957v.075c-.001.194-.01 1.108-.082 2.06l-.008.105-.009.104c-.05.572-.124 1.14-.235 1.558a2.01 2.01 0 0 1-1.415 1.42c-1.16.312-5.569.334-6.18.335h-.142c-.309 0-1.587-.006-2.927-.052l-.17-.006-.087-.004-.171-.007-.171-.007c-1.11-.049-2.167-.128-2.654-.26a2.01 2.01 0 0 1-1.415-1.419c-.111-.417-.185-.986-.235-1.558L.09 9.82l-.008-.104A31 31 0 0 1 0 7.68v-.123c.002-.215.01-.958.064-1.778l.007-.103.003-.052.008-.104.022-.26.01-.104c.048-.519.119-1.023.22-1.402a2.01 2.01 0 0 1 1.415-1.42c.487-.13 1.544-.21 2.654-.26l.17-.007.172-.006.086-.003.171-.007A100 100 0 0 1 7.858 2zM6.4 5.209v4.818l4.157-2.408z"/></svg>'

docs/config/_default/menus/menus.pt-br.toml

@@ -79,6 +79,27 @@
   pageRef = "/sensei/sensei_reference"
   weight = 4
 
+# Left-hand section sidebar for the Releases chapter (see menus.en.toml).
+[[sidebar_releases]]
+  name = "Atualizações Open Source"
+  pageRef = "/releases/os_upgrading"
+  weight = 0
+
+[[sidebar_releases]]
+  name = "Atualizações Pro"
+  pageRef = "/releases/pro"
+  weight = 1
+
+[[sidebar_releases]]
+  name = "Atualização no Kubernetes (Helm)"
+  pageRef = "/get_started/pro/onprem/kubernetes/upgrading_on_kubernetes"
+  weight = 2
+
+[[sidebar_releases]]
+  name = "Atualização no Docker Compose"
+  pageRef = "/get_started/pro/onprem/docker_compose/upgrading_on_docker_compose"
+  weight = 3
+
 [[social]]
   name = "YouTube"
   pre = '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-youtube" viewBox="0 0 16 16"><path d="M8.051 1.999h.089c.822.003 4.987.033 6.11.335a2.01 2.01 0 0 1 1.415 1.42c.101.38.172.883.22 1.402l.01.104.022.26.008.104c.065.914.073 1.77.074 1.957v.075c-.001.194-.01 1.108-.082 2.06l-.008.105-.009.104c-.05.572-.124 1.14-.235 1.558a2.01 2.01 0 0 1-1.415 1.42c-1.16.312-5.569.334-6.18.335h-.142c-.309 0-1.587-.006-2.927-.052l-.17-.006-.087-.004-.171-.007-.171-.007c-1.11-.049-2.167-.128-2.654-.26a2.01 2.01 0 0 1-1.415-1.419c-.111-.417-.185-.986-.235-1.558L.09 9.82l-.008-.104A31 31 0 0 1 0 7.68v-.123c.002-.215.01-.958.064-1.778l.007-.103.003-.052.008-.104.022-.26.01-.104c.048-.519.119-1.023.22-1.402a2.01 2.01 0 0 1 1.415-1.42c.487-.13 1.544-.21 2.654-.26l.17-.007.172-.006.086-.003.171-.007A100 100 0 0 1 7.858 2zM6.4 5.209v4.818l4.157-2.408z"/></svg>'

docs/config/_default/menus/menus.zh-hans.toml

@@ -79,6 +79,27 @@
   pageRef = "/sensei/sensei_reference"
   weight = 4
 
+# Left-hand section sidebar for the Releases chapter (see menus.en.toml).
+[[sidebar_releases]]
+  name = "开源升级"
+  pageRef = "/releases/os_upgrading"
+  weight = 0
+
+[[sidebar_releases]]
+  name = "Pro 升级"
+  pageRef = "/releases/pro"
+  weight = 1
+
+[[sidebar_releases]]
+  name = "在 Kubernetes (Helm) 上升级"
+  pageRef = "/get_started/pro/onprem/kubernetes/upgrading_on_kubernetes"
+  weight = 2
+
+[[sidebar_releases]]
+  name = "在 Docker Compose 上升级"
+  pageRef = "/get_started/pro/onprem/docker_compose/upgrading_on_docker_compose"
+  weight = 3
+
 [[social]]
   name = "YouTube"
   pre = '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-youtube" viewBox="0 0 16 16"><path d="M8.051 1.999h.089c.822.003 4.987.033 6.11.335a2.01 2.01 0 0 1 1.415 1.42c.101.38.172.883.22 1.402l.01.104.022.26.008.104c.065.914.073 1.77.074 1.957v.075c-.001.194-.01 1.108-.082 2.06l-.008.105-.009.104c-.05.572-.124 1.14-.235 1.558a2.01 2.01 0 0 1-1.415 1.42c-1.16.312-5.569.334-6.18.335h-.142c-.309 0-1.587-.006-2.927-.052l-.17-.006-.087-.004-.171-.007-.171-.007c-1.11-.049-2.167-.128-2.654-.26a2.01 2.01 0 0 1-1.415-1.419c-.111-.417-.185-.986-.235-1.558L.09 9.82l-.008-.104A31 31 0 0 1 0 7.68v-.123c.002-.215.01-.958.064-1.778l.007-.103.003-.052.008-.104.022-.26.01-.104c.048-.519.119-1.023.22-1.402a2.01 2.01 0 0 1 1.415-1.42c.487-.13 1.544-.21 2.654-.26l.17-.007.172-.006.086-.003.171-.007A100 100 0 0 1 7.858 2zM6.4 5.209v4.818l4.157-2.408z"/></svg>'