Skip to content

Commit c35e495

Browse files
authored
Merge pull request #12756 from DefectDojo/release/2.48.0
Release: Merge release into master from: release/2.48.0
2 parents 14dc4d4 + 9b52e50 commit c35e495

File tree

167 files changed

+134752
-14863
lines changed

Some content is hidden

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

167 files changed

+134752
-14863
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
run: echo "IMAGE_REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
4848

4949
- name: Set up Docker Buildx
50-
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
50+
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
5151

5252
- name: Build
5353
id: docker_build

.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.16.0'
24+
node-version: '22.17.0'
2525

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

.github/workflows/integration-tests.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,17 @@ jobs:
3131
"tests/search_test.py",
3232
"tests/file_test.py",
3333
"tests/dedupe_test.py",
34+
"tests/announcement_banner_test.py",
35+
"tests/close_old_findings_dedupe_test.py",
36+
"tests/close_old_findings_test.py",
37+
"tests/false_positive_history_test.py",
3438
"tests/check_various_pages.py",
39+
# "tests/import_scanner_test.py",
40+
# "tests/zap.py",
3541
"tests/notifications_test.py",
3642
"tests/tool_config.py",
3743
"openapi-validatator",
44+
3845
]
3946
os: [alpine, debian]
4047
fail-fast: false

.github/workflows/plantuml.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
with:
3434
args: -v -tpng ${{ steps.getfile.outputs.files }}
3535
- name: Push Local Changes
36-
uses: stefanzweifel/git-auto-commit-action@b863ae1933cb653a53c021fe36dbb774e1fb9403 # v5.2.0
36+
uses: stefanzweifel/git-auto-commit-action@778341af668090896ca464160c2def5d1d1a3eb0 # v6.0.1
3737
with:
3838
commit_user_name: "PlantUML_bot"
3939
commit_user_email: "noreply@defectdojo.org"

.github/workflows/release-1-create-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
grep -H version helm/defectdojo/Chart.yaml
8989
9090
- name: Push version changes
91-
uses: stefanzweifel/git-auto-commit-action@b863ae1933cb653a53c021fe36dbb774e1fb9403 # v5.2.0
91+
uses: stefanzweifel/git-auto-commit-action@778341af668090896ca464160c2def5d1d1a3eb0 # v6.0.1
9292
with:
9393
commit_user_name: "${{ env.GIT_USERNAME }}"
9494
commit_user_email: "${{ env.GIT_EMAIL }}"

.github/workflows/release-3-master-into-dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
if: endsWith(inputs.release_number_new, '.0') && endsWith(inputs.release_number_dev, '.0-dev')
7676

7777
- name: Push version changes
78-
uses: stefanzweifel/git-auto-commit-action@b863ae1933cb653a53c021fe36dbb774e1fb9403 # v5.2.0
78+
uses: stefanzweifel/git-auto-commit-action@778341af668090896ca464160c2def5d1d1a3eb0 # v6.0.1
7979
with:
8080
commit_user_name: "${{ env.GIT_USERNAME }}"
8181
commit_user_email: "${{ env.GIT_EMAIL }}"
@@ -140,7 +140,7 @@ jobs:
140140
grep version components/package.json
141141
142142
- name: Push version changes
143-
uses: stefanzweifel/git-auto-commit-action@b863ae1933cb653a53c021fe36dbb774e1fb9403 # v5.2.0
143+
uses: stefanzweifel/git-auto-commit-action@778341af668090896ca464160c2def5d1d1a3eb0 # v6.0.1
144144
with:
145145
commit_user_name: "${{ env.GIT_USERNAME }}"
146146
commit_user_email: "${{ env.GIT_EMAIL }}"

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

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

6262
- name: Set up Docker Buildx
6363
id: buildx
64-
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
64+
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
6565

6666
# we cannot set any tags here, those are set on the merged digest in release-x-manual-merge-container-digests.yml
6767
- name: Build and push images

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
echo "chart_version=$(ls build | cut -d '-' -f 2,3 | sed 's|\.tgz||')" >> $GITHUB_ENV
8989
9090
- name: Create release ${{ inputs.release_number }}
91-
uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631 # v2.2.2
91+
uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
9292
with:
9393
name: '${{ inputs.release_number }} 🌈'
9494
tag_name: ${{ inputs.release_number }}

.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.16.0'
21+
node-version: '22.17.0'
2222

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

Dockerfile.django-alpine

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ RUN export PYCURL_SSL_LIBRARY=openssl && \
6767
COPY \
6868
docker/entrypoint-celery-beat.sh \
6969
docker/entrypoint-celery-worker.sh \
70+
docker/entrypoint-celery-worker-dev.sh \
7071
docker/entrypoint-initializer.sh \
7172
docker/entrypoint-first-boot.sh \
7273
docker/entrypoint-uwsgi.sh \

0 commit comments

Comments
 (0)