Skip to content

Commit 8678a0d

Browse files
valentijnscholtenvalentijnscholten
committed
Merge remote-tracking branch 'upstream/dev' into perf3-reduce-saves
2 parents 1fd25b0 + 7614907 commit 8678a0d

File tree

116 files changed

+21605
-3100
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+21605
-3100
lines changed

‎.github/workflows/gh-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Setup Node
2222
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
2323
with:
24-
node-version: '22.17.0'
24+
node-version: '22.18.0'
2525

2626
- name: Cache dependencies
2727
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3

‎.github/workflows/release-x-manual-helm-chart.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
helm dependency update ./helm/defectdojo
7272
7373
- name: Add yq
74-
uses: mikefarah/yq@b534aa9ee5d38001fba3cd8fe254a037e4847b37 # v4.45.4
74+
uses: mikefarah/yq@f03c9dc599c37bfcaf533427211d05e51e6fee64 # v4.47.1
7575

7676
- name: Pin version docker version
7777
id: pin_image

‎.github/workflows/validate_docs_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup Node
1919
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
2020
with:
21-
node-version: '22.17.0'
21+
node-version: '22.18.0'
2222

2323
- name: Cache dependencies
2424
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3

‎Dockerfile.nginx-alpine

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ COPY manage.py ./
5454
COPY dojo/ ./dojo/
5555
RUN env DD_SECRET_KEY='.' python3 manage.py collectstatic --noinput && true
5656

57-
FROM nginx:1.28.0-alpine3.21@sha256:aed99734248e851764f1f2146835ecad42b5f994081fa6631cc5d79240891ec9
57+
FROM nginx:1.28.0-alpine3.21@sha256:d83c0138ea82c9f05c4378a5001e0c71256b647603c10c186bd7697a4db722d3
5858
ARG uid=1001
5959
ARG appuser=defectdojo
6060
COPY --from=collectstatic /app/static/ /usr/share/nginx/html/static/

‎Dockerfile.nginx-debian

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ COPY dojo/ ./dojo/
7373

7474
RUN env DD_SECRET_KEY='.' python3 manage.py collectstatic --noinput && true
7575

76-
FROM nginx:1.28.0-alpine3.21@sha256:aed99734248e851764f1f2146835ecad42b5f994081fa6631cc5d79240891ec9
76+
FROM nginx:1.28.0-alpine3.21@sha256:d83c0138ea82c9f05c4378a5001e0c71256b647603c10c186bd7697a4db722d3
7777
ARG uid=1001
7878
ARG appuser=defectdojo
7979
COPY --from=collectstatic /app/static/ /usr/share/nginx/html/static/

‎components/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "defectdojo",
3-
"version": "2.49.0-dev",
3+
"version": "2.50.0-dev",
44
"license" : "BSD-3-Clause",
55
"private": true,
66
"dependencies": {
@@ -13,7 +13,7 @@
1313
"chosen-js": "^1.8.7",
1414
"clipboard": "^2.0.11",
1515
"datatables.net": "^2.3.1",
16-
"datatables.net-buttons-bs": "^3.2.3",
16+
"datatables.net-buttons-bs": "^3.2.4",
1717
"datatables.net-colreorder": "^2.1.1",
1818
"drmonty-datatables-plugins": "^1.0.0",
1919
"drmonty-datatables-responsive": "^1.0.0",

‎components/yarn.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -187,19 +187,19 @@ datatables.net-bs@^2:
187187
datatables.net "2.3.2"
188188
jquery ">=1.7"
189189

190-
datatables.net-buttons-bs@^3.2.3:
191-
version "3.2.3"
192-
resolved "https://registry.yarnpkg.com/datatables.net-buttons-bs/-/datatables.net-buttons-bs-3.2.3.tgz#989dfaebad1731fc72ebe1fc33bf9e94b365ec2a"
193-
integrity sha512-1Td8OKEeyKB+W26pbqxUlea6NUoR0znQq2c2tqDfnCAWRBfJaNs2+xXBdYhylC5ACGmie1HieliS8kV9gAfY6w==
190+
datatables.net-buttons-bs@^3.2.4:
191+
version "3.2.4"
192+
resolved "https://registry.yarnpkg.com/datatables.net-buttons-bs/-/datatables.net-buttons-bs-3.2.4.tgz#7a883c3ee8c6428fb99e6e6e56c39d0051386039"
193+
integrity sha512-wOljUlsJ4sU5pABim+cwbO61ZFRv4aak1PkNL812i/qFwIEcsji7uz59PAx1ZoP1YdNtetj4Vn7D5oTU+Ijedw==
194194
dependencies:
195195
datatables.net-bs "^2"
196-
datatables.net-buttons "3.2.3"
196+
datatables.net-buttons "3.2.4"
197197
jquery ">=1.7"
198198

199-
datatables.net-buttons@3.2.3:
200-
version "3.2.3"
201-
resolved "https://registry.yarnpkg.com/datatables.net-buttons/-/datatables.net-buttons-3.2.3.tgz#26eae1f012fd5cfbfcf28dfbfd8a4b644ea8a4ae"
202-
integrity sha512-K+WeQWUYVGe5c3Gwb8Gfi7YpUXbJEerik3B2vynnVKpBlYBF5AHTGbrK1Psek2q/mjxeIVNHafQ9eX2otLhJVw==
199+
datatables.net-buttons@3.2.4:
200+
version "3.2.4"
201+
resolved "https://registry.yarnpkg.com/datatables.net-buttons/-/datatables.net-buttons-3.2.4.tgz#c58cc0bb518da8738bec6e64a54c1135dc257141"
202+
integrity sha512-anA39/R0kpHA2DOwqEHy/ZMXD5vf4tWmyNO0BnO0kJG7AFNvGTUCWBnBifXYg3G64U6JYpYY+MuTFKIB1/ZMTQ==
203203
dependencies:
204204
datatables.net "^2"
205205
jquery ">=1.7"

‎docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ services:
120120
source: ./docker/extra_settings
121121
target: /app/docker/extra_settings
122122
postgres:
123-
image: postgres:17.5-alpine@sha256:fbe21607052bb5c298674f2fd8cf044a63aa3ddf50b81627f894f91f40f50bcb
123+
image: postgres:17.5-alpine@sha256:6567bca8d7bc8c82c5922425a0baee57be8402df92bae5eacad5f01ae9544daa
124124
environment:
125125
POSTGRES_DB: ${DD_DATABASE_NAME:-defectdojo}
126126
POSTGRES_USER: ${DD_DATABASE_USER:-defectdojo}
@@ -129,7 +129,7 @@ services:
129129
- defectdojo_postgres:/var/lib/postgresql/data
130130
redis:
131131
# Pinning to this version due to licensing constraints
132-
image: redis:7.2.9-alpine@sha256:fce236b99c58ef7196c4e243e43f533b404d5c17239cae4e6e262b729a1952b3
132+
image: redis:7.2.10-alpine@sha256:395ccd7ee4db0867de0d0410f4712a9e0331cff9fdbd864f71ec0f7982d3ffe6
133133
volumes:
134134
- defectdojo_redis:/data
135135
volumes:

‎docs/assets/js/docsearch.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import docsearch from "@docsearch/js";
2+
3+
docsearch({
4+
container: '#docsearch',
5+
appId: '1JP5JYFGFC',
6+
indexName: 'DefectDojo Docs',
7+
apiKey: '213cc809a92717cffe6ffbe804d13fd1'
8+
});
9+
10+
const onClick = function () {
11+
document.getElementsByClassName("DocSearch-Button")[0].click();
12+
};
13+
14+
document.getElementById("searchToggleMobile").onclick = onClick;
15+
document.getElementById("searchToggleDesktop").onclick = onClick;

‎docs/assets/scss/app.scss

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
// Source: https://getbootstrap.com/docs/5.3/customize/sass/#importing
2+
3+
// 1. Include functions first (so you can manipulate colors, SVGs, calc, etc)
4+
@import "bootstrap/scss/functions";
5+
6+
// 2. Include any default variable overrides here
7+
@import "common/colors";
8+
@import "common/variables-overrides";
9+
@import "common/variables-custom";
10+
11+
// 3. Include remainder of required Bootstrap stylesheets (including any separate color mode stylesheets)
12+
@import "bootstrap/scss/variables";
13+
@import "bootstrap/scss/variables-dark";
14+
15+
// 4. Include any default map overrides here
16+
17+
// 5. Include remainder of required parts
18+
@import "bootstrap/scss/maps";
19+
@import "bootstrap/scss/mixins";
20+
@import "bootstrap/scss/root";
21+
22+
// 6. Optionally include any other parts as needed
23+
24+
// Layout & components
25+
@import "bootstrap/scss/utilities";
26+
@import "bootstrap/scss/reboot";
27+
@import "bootstrap/scss/type";
28+
@import "bootstrap/scss/images";
29+
@import "bootstrap/scss/containers";
30+
@import "bootstrap/scss/grid";
31+
@import "bootstrap/scss/helpers";
32+
@import "bootstrap/scss/tables";
33+
@import "bootstrap/scss/forms";
34+
@import "bootstrap/scss/buttons";
35+
@import "bootstrap/scss/transitions";
36+
@import "bootstrap/scss/dropdown";
37+
@import "bootstrap/scss/button-group";
38+
@import "bootstrap/scss/nav";
39+
@import "bootstrap/scss/navbar";
40+
@import "bootstrap/scss/card";
41+
@import "bootstrap/scss/accordion";
42+
@import "bootstrap/scss/breadcrumb";
43+
@import "bootstrap/scss/pagination";
44+
@import "bootstrap/scss/badge";
45+
@import "bootstrap/scss/alert";
46+
@import "bootstrap/scss/progress";
47+
@import "bootstrap/scss/list-group";
48+
@import "bootstrap/scss/close";
49+
@import "bootstrap/scss/toasts";
50+
@import "bootstrap/scss/modal";
51+
@import "bootstrap/scss/tooltip";
52+
@import "bootstrap/scss/popover";
53+
@import "bootstrap/scss/carousel";
54+
@import "bootstrap/scss/spinners";
55+
@import "bootstrap/scss/offcanvas";
56+
@import "bootstrap/scss/placeholders";
57+
58+
// 7. Optionally include utilities API last to generate classes based on the Sass map in `_utilities.scss`
59+
@import "bootstrap/scss/utilities/api";
60+
61+
// 8. Add additional custom code here
62+
@import "common/fonts";
63+
@import "common/global";
64+
@import "common/syntax";
65+
@import "common/dark";
66+
@import "components/alerts";
67+
@import "components/buttons";
68+
@import "components/callouts";
69+
@import "components/expressive-code";
70+
@import "components/code";
71+
@import "components/comments";
72+
@import "components/details";
73+
@import "components/forms";
74+
@import "components/images";
75+
@import "components/mermaid";
76+
@import "components/modals";
77+
@import "components/search";
78+
@import "components/section-nav";
79+
@import "components/steps";
80+
@import "components/tables";
81+
@import "components/tabs";
82+
@import "layouts/footer";
83+
@import "layouts/header";
84+
@import "layouts/pages";
85+
@import "layouts/posts";
86+
@import "layouts/sidebar";
87+
88+
/*
89+
body {
90+
background-color: {{ site.Params.doks.backGround }};
91+
}
92+
*/
93+
94+
// 9. Custom styles
95+
@import "common/custom";
96+
97+
// 10. DocSearch
98+
@import "common/variables-docsearch";
99+
@import "@docsearch/css/dist/modal";

0 commit comments

Comments
 (0)