Skip to content

Commit 5379541

Browse files
rossopsrossops
authored
Merge pull request #13536 from DefectDojo/release/2.51.3
Release: Merge release into master from: release/2.51.3
2 parents 7c0d92a + b444ba5 commit 5379541

Some content is hidden

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

41 files changed

+2564
-1419
lines changed

‎.github/renovate.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@
3030
"/^.github/workflows//"
3131
],
3232
"matchStrings": [
33-
"\\w*:\\s[\"']?(?<currentValue>\\S*[^\"']?)[\"']?\\s#\\s*renovate:\\s*datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s"
33+
"\\w*:\\s\"(?<currentValue>\\S+)\"\\s#\\s*renovate:\\s*datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s",
34+
"\\w*:\\s'(?<currentValue>\\S+)'\\s#\\s*renovate:\\s*datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s",
35+
"\\w*:\\s(?<currentValue>\\S+)\\s#\\s*renovate:\\s*datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s"
3436
],
3537
"versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}"
3638
}

‎.github/workflows/gh-pages.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ jobs:
1515
- name: Setup Hugo
1616
uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f # v3.0.0
1717
with:
18-
hugo-version: '0.140.1' # renovate: datasource=github-releases depName=gohugoio/hugo versioning=loose
18+
hugo-version: '0.152.1' # renovate: datasource=github-releases depName=gohugoio/hugo
1919
extended: true
2020

2121
- name: Setup Node
2222
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
2323
with:
24-
node-version: '22.20.0' # TODO: Renovate helper might not be needed here - needs to be fully tested
24+
node-version: '22.20.0'
2525

2626
- name: Cache dependencies
2727
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0

‎.github/workflows/k8s-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
# are tested (https://docs.aws.amazon.com/eks/latest/userguide/kubernetes-versions.html#available-versions)
2828
- databases: pgsql
2929
brokers: redis
30-
k8s: 'v1.34.0' # renovate: datasource=github-releases depName=kubernetes/kubernetes versioning=loose
30+
k8s: 'v1.34.0' # renovate: datasource=github-releases depName=kubernetes/kubernetes
3131
os: debian
3232
steps:
3333
- name: Checkout
@@ -36,7 +36,7 @@ jobs:
3636
- name: Setup Minikube
3737
uses: manusa/actions-setup-minikube@b589f2d61bf96695c546929c72b38563e856059d # v2.14.0
3838
with:
39-
minikube version: 'v1.37.0' # renovate: datasource=github-releases depName=kubernetes/minikube versioning=loose
39+
minikube version: 'v1.37.0' # renovate: datasource=github-releases depName=kubernetes/minikube
4040
kubernetes version: ${{ matrix.k8s }}
4141
driver: docker
4242
start args: '--addons=ingress --cni calico'

‎.github/workflows/shellcheck.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
pull_request:
55
env:
66
SHELLCHECK_REPO: 'koalaman/shellcheck'
7-
SHELLCHECK_VERSION: 'v0.9.0' # renovate: datasource=github-releases depName=koalaman/shellcheck versioning=loose
7+
SHELLCHECK_VERSION: 'v0.9.0' # renovate: datasource=github-releases depName=koalaman/shellcheck
88
SHELLCHECK_SHA: '038fd81de6b7e20cc651571362683853670cdc71' # Renovate config is not currently adjusted to update hash - it needs to be done manually for now
99
jobs:
1010
shellcheck:

‎.github/workflows/validate_docs_build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212
- name: Setup Hugo
1313
uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f # v3.0.0
1414
with:
15-
hugo-version: '0.140.1' # renovate: datasource=github-releases depName=gohugoio/hugo versioning=loose
15+
hugo-version: '0.152.1' # renovate: datasource=github-releases depName=gohugoio/hugo
1616
extended: true
1717

1818
- name: Setup Node
1919
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
2020
with:
21-
node-version: '22.20.0' # TODO: Renovate helper might not be needed here - needs to be fully tested
21+
node-version: '22.20.0'
2222

2323
- name: Cache dependencies
2424
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0

‎components/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "defectdojo",
3-
"version": "2.51.2",
3+
"version": "2.51.3",
44
"license" : "BSD-3-Clause",
55
"private": true,
66
"dependencies": {

‎docs/assets/favicon.svg‎

Lines changed: 57 additions & 0 deletions
Loading

‎docs/config/_default/hugo.toml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
title = "DefectDojo Documentation"
22
baseurl = "http://localhost/"
3-
canonifyURLs = false
43
disableAliases = true
54
disableHugoGeneratorInject = true
65
disableKinds = ["taxonomy", "term"]
@@ -84,3 +83,6 @@ copyRight = "Copyright (c) 2020-2024 Thulite"
8483
hint = "photo"
8584
quality = 85
8685
resampleFilter = "Lanczos"
86+
87+
[pagination]
88+
pagerSize = 10

‎docs/config/_default/module.toml‎

Lines changed: 50 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,52 @@
1-
# mounts
2-
## archetypes
3-
[[mounts]]
4-
source = "node_modules/@thulite/doks-core/archetypes"
5-
target = "archetypes"
1+
# Module Configuration File
2+
#
3+
# This file configures Hugo module settings, particularly module mounts which
4+
# define how content is organized within the project.
5+
#
6+
# Mounts specify file paths in your project that Hugo should use when building
7+
# the site. They allow for custom directory structures and integrating content
8+
# from different locations.
69

10+
## content
711
[[mounts]]
8-
source = "archetypes"
9-
target = "archetypes"
12+
source = "content"
13+
target = "content"
1014

11-
## assets
15+
## data
1216
[[mounts]]
13-
source = "node_modules/@thulite/core/assets"
14-
target = "assets"
17+
source = "node_modules/@thulite/doks-core/data"
18+
target = "data"
1519

1620
[[mounts]]
17-
source = "node_modules/@thulite/images/assets"
18-
target = "assets"
21+
source = "data"
22+
target = "data"
1923

24+
## layouts
2025
[[mounts]]
21-
source = "node_modules/@thulite/doks-core/assets"
22-
target = "assets"
26+
source = "layouts"
27+
target = "layouts"
2328

2429
[[mounts]]
25-
source = "node_modules/@tabler/icons/icons"
26-
target = "assets/svgs/tabler-icons"
30+
# Exclude 'home.html' to avoid conflicts with a custom home page layout defined in the local 'layouts' directory.
31+
excludeFiles = "home.html"
32+
source = "node_modules/@thulite/doks-core/layouts"
33+
target = "layouts"
2734

2835
[[mounts]]
29-
source = "assets"
30-
target = "assets"
36+
source = "node_modules/@thulite/core/layouts"
37+
target = "layouts"
3138

32-
## content
3339
[[mounts]]
34-
source = "content"
35-
target = "content"
40+
source = "node_modules/@thulite/seo/layouts"
41+
target = "layouts"
3642

37-
## data
3843
[[mounts]]
39-
source = "node_modules/@thulite/doks-core/data"
40-
target = "data"
44+
source = "node_modules/@thulite/images/layouts"
45+
target = "layouts"
4146

4247
[[mounts]]
43-
source = "data"
44-
target = "data"
48+
source = "node_modules/@thulite/inline-svg/layouts"
49+
target = "layouts"
4550

4651
## i18n
4752
[[mounts]]
@@ -52,30 +57,35 @@
5257
source = "i18n"
5358
target = "i18n"
5459

55-
## layouts
60+
## archetypes
5661
[[mounts]]
57-
source = "node_modules/@thulite/core/layouts"
58-
target = "layouts"
62+
source = "node_modules/@thulite/doks-core/archetypes"
63+
target = "archetypes"
5964

6065
[[mounts]]
61-
source = "node_modules/@thulite/seo/layouts"
62-
target = "layouts"
66+
source = "archetypes"
67+
target = "archetypes"
6368

69+
## assets
6470
[[mounts]]
65-
source = "node_modules/@thulite/images/layouts"
66-
target = "layouts"
71+
source = "node_modules/@thulite/core/assets"
72+
target = "assets"
6773

6874
[[mounts]]
69-
source = "node_modules/@thulite/doks-core/layouts"
70-
target = "layouts"
75+
source = "node_modules/@thulite/doks-core/assets"
76+
target = "assets"
7177

7278
[[mounts]]
73-
source = "node_modules/@thulite/inline-svg/layouts"
74-
target = "layouts"
79+
source = "node_modules/@tabler/icons/icons"
80+
target = "assets/svgs/tabler-icons"
7581

7682
[[mounts]]
77-
source = "layouts"
78-
target = "layouts"
83+
source = "node_modules/@thulite/images/assets"
84+
target = "assets"
85+
86+
[[mounts]]
87+
source = "assets"
88+
target = "assets"
7989

8090
## static
8191
[[mounts]]
@@ -84,4 +94,4 @@
8494

8595
[[mounts]]
8696
source = "static"
87-
target = "static"
97+
target = "static"

‎docs/config/postcss.config.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
const autoprefixer = require('autoprefixer');
2-
const purgecss = require('@fullhuman/postcss-purgecss');
2+
const { purgeCSSPlugin } = require('@fullhuman/postcss-purgecss');
33
const whitelister = require('purgecss-whitelister');
44

55
module.exports = {
66
plugins: [
77
autoprefixer(),
8-
purgecss({
8+
purgeCSSPlugin({
99
content: ['./hugo_stats.json'],
1010
extractors: [
1111
{
@@ -18,7 +18,6 @@ module.exports = {
1818
],
1919
dynamicAttributes: [
2020
'aria-expanded',
21-
'aria-selected',
2221
'data-bs-popper',
2322
'data-bs-target',
2423
'data-bs-theme',
@@ -62,4 +61,4 @@ module.exports = {
6261
]
6362
})
6463
]
65-
};
64+
};

0 commit comments

Comments
 (0)