Skip to content

Commit b89f558

Browse files
rossopsrossops
authored
Merge branch 'dev' into master-into-dev/2.55.2-2.56.0-dev
2 parents dd4ed82 + 9874f5a commit b89f558

14 files changed

Lines changed: 86 additions & 49 deletions

File tree

‎.github/workflows/renovate.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
uses: suzuki-shunsuke/github-action-renovate-config-validator@ca480cb7ec89a9e1cd8c214ad33bda1617184027 # v2.0.0
2222
with:
2323
strict: "true"
24-
validator_version: 42.92.5 # renovate: datasource=github-releases depName=renovatebot/renovate
24+
validator_version: 43.2.4 # renovate: datasource=github-releases depName=renovatebot/renovate

‎Dockerfile.django-alpine‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Dockerfile.nginx to use the caching mechanism of Docker.
66

77
# Ref: https://devguide.python.org/#branchstatus
8-
FROM python:3.13.11-alpine3.22@sha256:2fd93799bfc6381d078a8f656a5f45d6092e5d11d16f55889b3d5cbfdc64f045 AS base
8+
FROM python:3.13.12-alpine3.22@sha256:aac7cd4e79ca7f667c957eab2b5eac29e8a39b0f3309544b581dbc7ca108b40a AS base
99
FROM base AS build
1010
WORKDIR /app
1111
RUN \

‎Dockerfile.django-debian‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Dockerfile.nginx to use the caching mechanism of Docker.
66

77
# Ref: https://devguide.python.org/#branchstatus
8-
FROM python:3.13.11-slim-trixie@sha256:51e1a0a317fdb6e170dc791bbeae63fac5272c82f43958ef74a34e170c6f8b18 AS base
8+
FROM python:3.13.12-slim-trixie@sha256:a7a03d8253322dba5b97771f4971c6ee17c561f736bff7065e5ad53d755a0a24 AS base
99
FROM base AS build
1010
WORKDIR /app
1111
RUN \

‎Dockerfile.integration-tests-debian‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
FROM openapitools/openapi-generator-cli:v7.19.0@sha256:b9e7ad71a9f9406bd810378a939755fad114747a767e29bbf83ef9364d5f9dc0 AS openapitools
55
# currently only supports x64, no arm yet due to chrome and selenium dependencies
6-
FROM python:3.13.11-slim-trixie@sha256:51e1a0a317fdb6e170dc791bbeae63fac5272c82f43958ef74a34e170c6f8b18 AS build
6+
FROM python:3.13.12-slim-trixie@sha256:a7a03d8253322dba5b97771f4971c6ee17c561f736bff7065e5ad53d755a0a24 AS build
77
WORKDIR /app
88
RUN \
99
apt-get -y update && \

‎Dockerfile.nginx-alpine‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Dockerfile.django-alpine to use the caching mechanism of Docker.
66

77
# Ref: https://devguide.python.org/#branchstatus
8-
FROM python:3.13.11-alpine3.22@sha256:2fd93799bfc6381d078a8f656a5f45d6092e5d11d16f55889b3d5cbfdc64f045 AS base
8+
FROM python:3.13.12-alpine3.22@sha256:aac7cd4e79ca7f667c957eab2b5eac29e8a39b0f3309544b581dbc7ca108b40a AS base
99
FROM base AS build
1010
WORKDIR /app
1111
RUN \

‎components/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"chosen-bootstrap": "https://github.com/dbtek/chosen-bootstrap",
1313
"chosen-js": "^1.8.7",
1414
"clipboard": "^2.0.11",
15-
"datatables.net": "^2.3.6",
15+
"datatables.net": "^2.3.7",
1616
"datatables.net-buttons-bs": "^3.2.6",
1717
"datatables.net-colreorder": "^2.1.2",
1818
"drmonty-datatables-plugins": "^1.0.0",

‎components/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,10 @@ datatables.net@2.3.2:
162162
dependencies:
163163
jquery ">=1.7"
164164

165-
datatables.net@^2, datatables.net@^2.3.6:
166-
version "2.3.6"
167-
resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-2.3.6.tgz#a11be57a2b50d7231cae2980a8ff1df3c18b7b17"
168-
integrity sha512-xQ/dCxrjfxM0XY70wSIzakkTZ6ghERwlLmAPyCnu8Sk5cyt9YvOVyOsFNOa/BZ/lM63Q3i2YSSvp/o7GXZGsbg==
165+
datatables.net@^2, datatables.net@^2.3.7:
166+
version "2.3.7"
167+
resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-2.3.7.tgz#3cd34f6f5d1f40a46b5a20a4ba32604bdbcd6738"
168+
integrity sha512-AvsjG/Nkp6OxeyBKYZauemuzQCPogE1kOtKwG4sYjvdqGCSLiGaJagQwXv4YxG+ts5vaJr6qKGG9ec3g6vTo3w==
169169
dependencies:
170170
jquery ">=1.7"
171171

‎docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,15 +120,15 @@ services:
120120
source: ./docker/extra_settings
121121
target: /app/docker/extra_settings
122122
postgres:
123-
image: postgres:18.1-alpine@sha256:4eb15de8e7b692c02427a2df278d18eb89422a534e428efb6d43c968250334d4
123+
image: postgres:18.1-alpine@sha256:aa6eb304ddb6dd26df23d05db4e5cb05af8951cda3e0dc57731b771e0ef4ab29
124124
environment:
125125
POSTGRES_DB: ${DD_DATABASE_NAME:-defectdojo}
126126
POSTGRES_USER: ${DD_DATABASE_USER:-defectdojo}
127127
POSTGRES_PASSWORD: ${DD_DATABASE_PASSWORD:-defectdojo}
128128
volumes:
129129
- defectdojo_postgres:/var/lib/postgresql/data
130130
valkey:
131-
image: valkey/valkey:7.2.11-alpine@sha256:9e483e0fe4c98b631b166b41d530c7ff1b8009a44f261bff28e9d1e2e27db58d
131+
image: valkey/valkey:7.2.11-alpine@sha256:10328d00120dc14fbc87b2ed61b7677ddbb0d011e705361b4788329a0ec69a93
132132
volumes:
133133
# we keep using the redis volume as renaming is not possible and copying data over
134134
# would require steps during downtime or complex commands in the intializer

‎docs/content/en/open_source/upgrading/2.56.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
title: 'Upgrading to DefectDojo Version 2.56.x'
3+
toc_hide: true
4+
weight: -20260203
5+
description: No special instructions.
6+
---
7+
There are no special instructions for upgrading to 2.56.x. Check the [Release Notes](https://github.com/DefectDojo/django-DefectDojo/releases/tag/2.56.0) for the contents of the release.

‎dojo/templates/notifications/mail/product_type_added.tpl‎

Lines changed: 52 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,57 @@
11
{% load i18n %}
22
{% load navigation_tags %}
33
{% load display_tags %}
4+
{% url 'view_product_type' product_type.id as product_type_url %}
5+
46
<html>
5-
<body>
6-
{% autoescape on %}
7-
<p>
8-
{% trans "Hello" %},
9-
</p>
10-
<p>
11-
{% blocktranslate trimmed prod_url=url|full_url %}
12-
The new product type "{{ title }}" has been added. It can be viewed here: <a href="{{ prod_url }}">{{ title }}</a>
13-
{% endblocktranslate %}
14-
</p>
15-
<br/>
16-
<br/>
17-
{% trans "Kind regards" %},<br/>
18-
<br/>
19-
{% if system_settings.team_name %}
20-
{{ system_settings.team_name }}
21-
{% else %}
22-
Defect Dojo
23-
{% endif %}
24-
<p>
25-
<br/>
26-
<br/>
27-
<p>
28-
{% url 'notifications' as notification_url %}
29-
{% trans "You can manage your notification settings here" %}: <a href="{{ notification_url|full_url }}">{{ notification_url|full_url }}</a>
30-
</p>
31-
{% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
32-
<br/>
33-
<div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
34-
<span style="font-size:16pt; font-family: 'Cambria','times new roman','garamond',serif; color:#ff0000;">{% trans "Disclaimer" %}</span><br/>
35-
<p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer_notifications }}</p>
36-
</div>
37-
{% endif %}
38-
{% endautoescape %}
39-
</body>
7+
<body>
8+
{% autoescape on %}
9+
<p>
10+
{% trans "Hello" %},
11+
</p>
12+
13+
<p>
14+
{% blocktranslate trimmed with title=title prod_url=product_type_url|full_url %}
15+
The new product type "{{ title }}" has been added.
16+
It can be viewed here: <a href="{{ prod_url }}">{{ title }}</a>
17+
{% endblocktranslate %}
18+
</p>
19+
20+
<br/>
21+
<br/>
22+
23+
{% trans "Kind regards" %},<br/>
24+
<br/>
25+
26+
{% if system_settings.team_name %}
27+
{{ system_settings.team_name }}
28+
{% else %}
29+
Defect Dojo
30+
{% endif %}
31+
32+
<p>
33+
<br/>
34+
<br/>
35+
</p>
36+
37+
<p>
38+
{% url 'notifications' as notification_url %}
39+
{% trans "You can manage your notification settings here" %}:
40+
<a href="{{ notification_url|full_url }}">{{ notification_url|full_url }}</a>
41+
</p>
42+
43+
{% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
44+
<br/>
45+
<div style="background-color:#DADCE2; border:1px #003333; padding:.8em;">
46+
<span style="font-size:16pt; font-family:'Cambria','times new roman','garamond',serif; color:#ff0000;">
47+
{% trans "Disclaimer" %}
48+
</span>
49+
<br/>
50+
<p style="font-size:11pt; line-height:10pt; font-family:'Cambria','times roman',serif;">
51+
{{ system_settings.disclaimer_notifications }}
52+
</p>
53+
</div>
54+
{% endif %}
55+
{% endautoescape %}
56+
</body>
4057
</html>

0 commit comments

Comments
 (0)