Merge pull request #11112 from DefectDojo/master-into-dev/2.39.2-2.40…

….0-dev Release: Merge back 2.39.2 into dev from: master-into-dev/2.39.2-2.40.0-dev
DefectDojo · Oct 21, 2024 · 8bf2ec5 · 8bf2ec5
2 parents e24aa1b + c9c8ec6
commit 8bf2ec5
Show file tree

Hide file tree

Showing 11 changed files with 136 additions and 269 deletions.
diff --git a/docker/entrypoint-initializer.sh b/docker/entrypoint-initializer.sh
@@ -154,7 +154,7 @@ EOD
    echo "Importing fixtures all at once"
    python3 manage.py loaddata system_settings initial_banner_conf product_type test_type \
        development_environment benchmark_type benchmark_category benchmark_requirement \
-       language_type objects_review regulation initial_surveys role
+       language_type objects_review regulation initial_surveys role sla_configurations
 
   echo "UPDATE dojo_system_settings SET jira_webhook_secret='$DD_JIRA_WEBHOOK_SECRET'" | python manage.py dbshell
 

diff --git a/docs/content/en/getting_started/architecture.md b/docs/content/en/getting_started/architecture.md
@@ -20,8 +20,8 @@ dynamic content.
 
 ## Message Broker
 
-The application server sends tasks to a [Message Broker](https://docs.celeryproject.org/en/stable/getting-started/brokers/index.html)
-for asynchronous execution.
+The application server sends tasks to a [Message Broker](https://docs.celeryq.dev/en/stable/getting-started/backends-and-brokers/index.html)
+for asynchronous execution. Currently, only [Redis](https://github.com/redis/redis) is supported as a broker.
 
 ## Celery Worker
 

diff --git a/docs/content/en/integrations/importing.md b/docs/content/en/integrations/importing.md
@@ -69,7 +69,7 @@ An import can be performed by specifying the names of these entities in the API
 }
 ```
 
-When `auto_create_context` is `True`, the product and engagement will be created if needed. Make sure your user has sufficient [permissions](../usage/permissions) to do this.
+When `auto_create_context` is `True`, the product, engagement, and environment will be created if needed. Make sure your user has sufficient [permissions](../usage/permissions) to do this.
 
 A classic way of importing a scan is by specifying the ID of the engagement instead:
-Original file line number
+Diff line change
@@ Expand Up @@
     }
     ```
-    When `auto_create_context` is `True`, the product and engagement will be created if needed. Make sure your user has sufficient [permissions](../usage/permissions) to do this.
+    When `auto_create_context` is `True`, the product, engagement, and environment will be created if needed. Make sure your user has sufficient [permissions](../usage/permissions) to do this.
     A classic way of importing a scan is by specifying the ID of the engagement instead:
@@ Expand Down @@