Skip to content

Commit 9fc2035

Browse files
authored
Merge pull request #11725 from DefectDojo/master-into-bugfix/2.43.0-2.44.0-dev
Release: Merge back 2.43.0 into bugfix from: master-into-bugfix/2.43.0-2.44.0-dev
2 parents d3b3c26 + 9d9929b commit 9fc2035

File tree

396 files changed

+14100
-2619
lines changed

Some content is hidden

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

396 files changed

+14100
-2619
lines changed

.dryrunsecurity.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ sensitiveCodepaths:
5252
- 'docker/entrypoint-celery-beat.sh'
5353
- 'docker/entrypoint-celery-worker.sh'
5454
- 'docker/entrypoint-initializer.sh'
55+
- 'docker/entrypoint-first-boot.sh'
5556
- 'docker/entrypoint-nginx.sh'
5657
- 'docker/entrypoint-uwsgi.sh'
5758
- 'docker/wait-for-it.sh'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
- name: Build
3737
id: docker_build
38-
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
38+
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
3939
timeout-minutes: 10
4040
env:
4141
DOCKER_BUILD_CHECKS_ANNOTATIONS: false
@@ -49,7 +49,7 @@ jobs:
4949
# export docker images to be used in next jobs below
5050
- name: Upload image ${{ matrix.docker-image }} as artifact
5151
timeout-minutes: 10
52-
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
52+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
5353
with:
5454
name: built-docker-image-${{ matrix.docker-image }}-${{ matrix.os }}
5555
path: ${{ matrix.docker-image }}-${{ matrix.os }}_img

.github/workflows/detect-merge-conflicts.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: check if prs are conflicted
19-
uses: eps1lon/actions-label-merge-conflict@1b1b1fcde06a9b3d089f3464c96417961dde1168 # v3.0.2
19+
uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
2020
with:
2121
dirtyLabel: "conflicts-detected"
2222
repoToken: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/fetch-oas.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
run: docker compose down
5252

5353
- name: Upload oas.${{ matrix.file-type }} as artifact
54-
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
54+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
5555
with:
5656
name: oas-${{ matrix.file-type }}
5757
path: oas.${{ matrix.file-type }}

.github/workflows/gh-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
extended: true
2020

2121
- name: Setup Node
22-
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
22+
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
2323
with:
2424
node-version: '22.5.1'
2525

.github/workflows/k8s-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3636

3737
- name: Setup Minikube
38-
uses: manusa/actions-setup-minikube@0e8062ceff873bd77979f39cf8fd3621416afe4d # v2.13.0
38+
uses: manusa/actions-setup-minikube@5d9440a1b535e8b4f541eaac559681a9022df29d # v2.13.1
3939
with:
4040
minikube version: 'v1.33.1'
4141
kubernetes version: ${{ matrix.k8s }}

.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@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1
36+
uses: stefanzweifel/git-auto-commit-action@e348103e9026cc0eee72ae06630dbe30c8bf7a79 # v5.1.0
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
@@ -75,7 +75,7 @@ jobs:
7575
grep -H version helm/defectdojo/Chart.yaml
7676
7777
- name: Push version changes
78-
uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1
78+
uses: stefanzweifel/git-auto-commit-action@e348103e9026cc0eee72ae06630dbe30c8bf7a79 # v5.1.0
7979
with:
8080
commit_user_name: "${{ env.GIT_USERNAME }}"
8181
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
@@ -73,7 +73,7 @@ jobs:
7373
if: endsWith(github.event.inputs.release_number_new, '.0') && endsWith(github.event.inputs.release_number_dev, '.0-dev')
7474

7575
- name: Push version changes
76-
uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1
76+
uses: stefanzweifel/git-auto-commit-action@e348103e9026cc0eee72ae06630dbe30c8bf7a79 # v5.1.0
7777
with:
7878
commit_user_name: "${{ env.GIT_USERNAME }}"
7979
commit_user_email: "${{ env.GIT_EMAIL }}"
@@ -139,7 +139,7 @@ jobs:
139139
grep version components/package.json
140140
141141
- name: Push version changes
142-
uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1
142+
uses: stefanzweifel/git-auto-commit-action@e348103e9026cc0eee72ae06630dbe30c8bf7a79 # v5.1.0
143143
with:
144144
commit_user_name: "${{ env.GIT_USERNAME }}"
145145
commit_user_email: "${{ env.GIT_EMAIL }}"

.github/workflows/release-drafter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
steps:
2828
- name: Create Release
2929
id: create_release
30-
uses: release-drafter/release-drafter@3f0f87098bd6b5c5b9a36d49c41d998ea58f9348 # v6.0.0
30+
uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6.1.0
3131
with:
3232
version: ${{ github.event.inputs.version }}
3333
env:

0 commit comments

Comments
 (0)