Skip to content

Commit

Permalink
Merge pull request #11110 from DefectDojo/release/2.39.2
Browse files Browse the repository at this point in the history
Release: Merge release into master from: release/2.39.2
  • Loading branch information
rossops authored Oct 21, 2024
2 parents 52e9f16 + 864da41 commit 5c7de81
Show file tree
Hide file tree
Showing 13 changed files with 139 additions and 272 deletions.
2 changes: 1 addition & 1 deletion components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "defectdojo",
"version": "2.39.1",
"version": "2.39.2",
"license" : "BSD-3-Clause",
"private": true,
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion docker/entrypoint-initializer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions docs/content/en/getting_started/architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/content/en/integrations/importing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion dojo/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
# Django starts so that shared_task will use this app.
from .celery import app as celery_app # noqa: F401

__version__ = "2.39.1"
__version__ = "2.39.2"
__url__ = "https://github.com/DefectDojo/django-DefectDojo"
__docs__ = "https://documentation.defectdojo.com"
Loading

0 comments on commit 5c7de81

Please sign in to comment.