Skip to content

Commit 67d25db

Browse files
authored
Merge branch 'bugfix' into better-versioning
2 parents d3707ef + 2051e7f commit 67d25db

61 files changed

Lines changed: 1356 additions & 43 deletions

Some content is hidden

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

.gitattributes

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Normalize line endings to LF
2+
*.sh text eol=lf
3+
*.expect text eol=lf
4+
*.py text eol=lf
5+
*.yml text eol=lf
6+
*.yaml text eol=lf
7+
*.md text eol=lf
8+
9+
# Binary files — never touch line endings
10+
*.png binary
11+
*.jpg binary
12+
*.gif binary
13+
*.ico binary
14+
*.pdf binary

.github/dependabot.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ updates:
44
directory: "/"
55
schedule:
66
interval: daily
7+
time: "08:00"
78
open-pull-requests-limit: 10
89
target-branch: dev
910
ignore:
@@ -17,6 +18,7 @@ updates:
1718
directory: "/components"
1819
schedule:
1920
interval: daily
21+
time: "08:00"
2022
open-pull-requests-limit: 10
2123
target-branch: dev
2224
ignore:

.github/workflows/validate_docs_build.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,10 @@ jobs:
4040
HUGO_ENVIRONMENT: production
4141
HUGO_ENV: production
4242
run: cd docs && npm ci && hugo --minify --gc --config config/production/hugo.toml
43+
44+
- name: Check internal links
45+
uses: lycheeverse/lychee-action@8646ba30535128ac92d33dfc9133794bfdd9b411 # v2
46+
with:
47+
args: --offline --no-progress --root-dir docs/public './docs/public/**/*.html'
48+
fail: true
49+

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,3 +149,6 @@ docs/.devcontainer/Dockerfile
149149
docs/LICENSE
150150
docs/.hugo_build.lock
151151
.cursor-rules
152+
153+
# claude etc
154+
MEMORY.md

docker-compose.override.dev.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,22 @@ services:
7373
mode: host
7474
"webhook.endpoint":
7575
image: mccutchen/go-httpbin:2.20.0@sha256:b1620821b6ff191d911629f87a720b88df5397c2554045f1cfb1ffde17c9b898
76+
integration-tests:
77+
platform: "linux/amd64"
78+
profiles:
79+
- integration
80+
build:
81+
context: ./
82+
dockerfile: ${INTEGRATION_TESTS_DOCKERFILE:-Dockerfile.integration-tests-debian}
83+
image: "defectdojo/defectdojo-integration-tests:${INTEGRATION_TESTS_VERSION:-latest}"
84+
depends_on:
85+
- nginx
86+
- uwsgi
87+
entrypoint: ['/wait-for-it.sh', '${DD_DATABASE_HOST:-postgres}:${DD_DATABASE_PORT:-5432}', '-t', '30', '--', '/app/docker/entrypoint-integration-tests.sh']
88+
volumes:
89+
- '.:/app:z'
90+
environment:
91+
DD_BASE_URL: 'http://nginx:8080/'
92+
DD_ADMIN_USER: "${DD_ADMIN_USER:-admin}"
93+
DD_ADMIN_PASSWORD: "${DD_ADMIN_PASSWORD:-admin}"
94+
DD_INTEGRATION_TEST_FILENAME: "${DD_INTEGRATION_TEST_FILENAME:-}"

docker-compose.override.integration_tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
services:
33
integration-tests:
4+
platform: "linux/amd64"
45
build:
56
context: ./
67
dockerfile: ${INTEGRATION_TESTS_DOCKERFILE:-Dockerfile.integration-tests-debian}

docs/assets/images/OSC_ss1.png

244 KB
Loading

docs/assets/images/OSC_ss2.png

321 KB
Loading

docs/assets/images/OSC_ss3.png

392 KB
Loading

docs/assets/scss/common/_custom.scss

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,30 @@ h1, h2, h3, h4, h5, h6,
9898
visibility: hidden; // Hide sidebar until version is resolved
9999
}
100100

101+
@media (min-width: 992px) {
102+
@supports ((position: -webkit-sticky) or (position: sticky)) {
103+
.docs-sidebar {
104+
display: flex !important; // Override Bootstrap d-lg-block { display: block !important }
105+
flex-direction: column;
106+
}
107+
108+
.docs-version-toggle {
109+
flex-shrink: 0;
110+
}
111+
112+
.version-menu-wrapper {
113+
flex: 1;
114+
min-height: 0; // Required: allows flex child to shrink below content size
115+
overflow-y: auto;
116+
}
117+
118+
.docs-links {
119+
max-height: none; // Parent flex container now handles height/scroll
120+
overflow: visible;
121+
}
122+
}
123+
}
124+
101125
.doks-sidebar .section-nav a {
102126
color: #333333; // Dojo Hue 04
103127
transition: color 0.15s ease, background-color 0.15s ease;

0 commit comments

Comments
 (0)