Skip to content

Commit b475157

Browse files
authored
Merge branch 'dev' into update-sample-data
2 parents 81b622e + 22bf8a8 commit b475157

34 files changed

Lines changed: 1567 additions & 255 deletions

.github/workflows/build-docker-images-for-testing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
# export docker images to be used in next jobs below
6868
- name: Upload image ${{ matrix.docker-image }} as artifact
6969
timeout-minutes: 15
70-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
70+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
7171
with:
7272
name: built-docker-image-${{ matrix.docker-image }}-${{ matrix.os }}-${{ env.PLATFORM }}
7373
path: ${{ matrix.docker-image }}-${{ matrix.os }}-${{ env.PLATFORM }}_img

.github/workflows/fetch-oas.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
run: docker compose down
5656

5757
- name: Upload oas.${{ matrix.file-type }} as artifact
58-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
58+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
5959
with:
6060
name: oas-${{ matrix.file-type }}
6161
path: oas.${{ matrix.file-type }}

.github/workflows/integration-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292

9393
# load docker images from build jobs
9494
- name: Load images from artifacts
95-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
95+
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
9696
with:
9797
path: built-docker-image
9898
pattern: built-docker-image-*

.github/workflows/k8s-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
minikube status
3939
4040
- name: Load images from artifacts
41-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
41+
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
4242
with:
4343
path: built-docker-image
4444
pattern: built-docker-image-*

.github/workflows/release-drafter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
runs-on: ubuntu-latest
4848
steps:
4949
- name: Load OAS files from artifacts
50-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
50+
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
5151
with:
5252
pattern: oas-*
5353

.github/workflows/release-x-manual-docker-containers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
9191
# upload the digest file as artifact
9292
- name: Upload digest
93-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
93+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
9494
with:
9595
name: digests-${{ matrix.docker-image}}-${{ matrix.os }}-${{ env.PLATFORM }}
9696
path: ${{ runner.temp }}/digests/*

.github/workflows/release-x-manual-merge-container-digests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
# only download digests for this image and this os
4343
- name: Download digests
44-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
44+
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
4545
with:
4646
path: ${{ runner.temp }}/digests
4747
pattern: digests-${{ matrix.docker-image}}-${{ matrix.os }}-*

.github/workflows/rest-framework-tests.yml

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

3434
# load docker images from build jobs
3535
- name: Load images from artifacts
36-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
36+
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
3737
with:
3838
path: built-docker-image
3939
pattern: built-docker-image-*

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ services:
129129
volumes:
130130
- defectdojo_postgres:/var/lib/postgresql/data
131131
valkey:
132-
image: valkey/valkey:7.2.11-alpine@sha256:10328d00120dc14fbc87b2ed61b7677ddbb0d011e705361b4788329a0ec69a93
132+
image: valkey/valkey:7.2.12-alpine@sha256:32860ea506d2dde08333d1cca2bf28c46bc84e9654308eabf801f77548f72573
133133
volumes:
134134
# we keep using the redis volume as renaming is not possible and copying data over
135135
# would require steps during downtime or complex commands in the intializer

docs/assets/js/custom.js

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
console.log("[VersionToggle] Setting version to:", version);
1212

1313
document.querySelectorAll(".version-opensource, .version-pro").forEach(el => {
14-
el.style.display = el.classList.contains(`version-${version}`) ? "" : "none";
14+
el.style.display = el.classList.contains(`version-${version}`) ? "block" : "none";
1515
});
1616

1717
localStorage.setItem("version", version);
@@ -58,3 +58,35 @@
5858
observer.observe(document.body, { childList: true, subtree: true });
5959

6060
})();
61+
62+
63+
// Scroll progress bar — shows reading progress on doc pages
64+
(() => {
65+
"use strict";
66+
67+
const init = () => {
68+
// Only add on doc pages (pages with .docs-content)
69+
if (!document.querySelector('.docs-content')) return;
70+
71+
const bar = document.createElement('div');
72+
bar.className = 'scroll-progress';
73+
bar.style.width = '0%';
74+
document.body.appendChild(bar);
75+
76+
const update = () => {
77+
const scrollTop = window.scrollY;
78+
const docHeight = document.documentElement.scrollHeight - window.innerHeight;
79+
const progress = docHeight > 0 ? (scrollTop / docHeight) * 100 : 0;
80+
bar.style.width = progress + '%';
81+
};
82+
83+
window.addEventListener('scroll', update, { passive: true });
84+
update();
85+
};
86+
87+
if (document.readyState === 'loading') {
88+
document.addEventListener('DOMContentLoaded', init);
89+
} else {
90+
init();
91+
}
92+
})();

0 commit comments

Comments
 (0)