Merge branch 'dev' into misc-import-updates

Author: dogboat

.github/workflows/k8s-tests.yml

@@ -16,7 +16,7 @@ jobs:
           # databases, broker and k8s are independent, so we don't need to test each combination
           # lastest k8s version (https://kubernetes.io/releases/) and the oldest officially supported version
           # are tested (https://kubernetes.io/releases/)
-          - k8s: 'v1.35.4' # renovate: datasource=github-releases depName=kubernetes/kubernetes versioning=loose
+          - k8s: 'v1.35.6' # renovate: datasource=github-releases depName=kubernetes/kubernetes versioning=loose
             os: debian
           - k8s: '1.34.9' # renovate: datasource=custom.endoflife-oldest-maintained depName=kubernetes
             os: debian

.gitignore

@@ -153,3 +153,5 @@ docs/.hugo_build.lock
 # claude etc
 MEMORY.md
 .claude/
+CLAUDE.md
+CLAUDE.local.md

components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "defectdojo",
-  "version": "3.1.0-dev",
+  "version": "3.2.0-dev",
   "license": "BSD-3-Clause",
   "private": true,
   "dependencies": {

components/tailwind.css

@@ -1177,6 +1177,9 @@
   box-shadow: 0 4px 16px rgba(0,0,0,.12), 0 1px 3px rgba(0,0,0,.06);
 }
 .open > .dropdown-menu { display: block; }
+/* Right-align the menu to its toggle (e.g. dropdowns pinned to the right
+   edge of a header) so it opens leftward instead of overflowing the page. */
+.dropdown-menu-right { right: 0; left: auto; }
 .dropdown-menu > li > a,
 .dropdown-menu > a {
   display: block;

docker-compose.override.integration_tests.yml

@@ -46,6 +46,12 @@ services:
     environment:
       DD_DATABASE_URL: ${DD_TEST_DATABASE_URL:-postgresql://defectdojo:defectdojo@postgres:5432/test_defectdojo}
       DD_V3_FEATURE_LOCATIONS: ${DD_V3_FEATURE_LOCATIONS:-False}
+      # Delay deduplication batches so the async_wait integration test can
+      # deterministically distinguish a blocking join (async_wait) from a
+      # non-blocking one (async). Scoped by _FILTER to that test's findings so
+      # other dedupe tests are unaffected. Integration-test stack only; never prod.
+      DD_DEDUPLICATION_BATCH_PROCESS_TEST_DELAY: 10
+      DD_DEDUPLICATION_BATCH_PROCESS_TEST_DELAY_FILTER: "async_wait finding"
   initializer:
     environment:
       PYTHONWARNINGS: error  # We are strict about Warnings during testing