Skip to content

Commit e6a88af

Browse files
MaffoochMaffooch
authored
Merge pull request DefectDojo#6943 from DefectDojo/release/2.15.0
Release: Merge release into master from: release/2.15.0
2 parents d8f759d + 92a0294 commit e6a88af

File tree

110 files changed

+4394
-1050
lines changed

Some content is hidden

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

110 files changed

+4394
-1050
lines changed

‎.flake8‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ ignore =
2525
E128
2626
# line break after binary operator
2727
W504
28+
# Line break occurred before a binary operator (conflicting with black)
29+
W503
2830
# undefined file name excpetion
2931
F821
3032

‎.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@v4.14.1
36+
uses: stefanzweifel/git-auto-commit-action@v4.15.0
3737
with:
3838
commit_user_name: "PlantUML_bot"
3939
commit_user_email: "[email protected]"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
grep -H version helm/defectdojo/Chart.yaml
6969
7070
- name: Push version changes
71-
uses: stefanzweifel/git-auto-commit-action@v4.14.1
71+
uses: stefanzweifel/git-auto-commit-action@v4.15.0
7272
with:
7373
commit_user_name: "${{ env.GIT_USERNAME }}"
7474
commit_user_email: "${{ env.GIT_EMAIL }}"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
grep appVersion helm/defectdojo/Chart.yaml
5050
grep version components/package.json
5151
- name: Push version changes
52-
uses: stefanzweifel/git-auto-commit-action@v4.14.1
52+
uses: stefanzweifel/git-auto-commit-action@v4.15.0
5353
with:
5454
commit_user_name: "${{ env.GIT_USERNAME }}"
5555
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
@@ -19,7 +19,7 @@ jobs:
1919
update_release_draft:
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: release-drafter/release-drafter@v5.20.1
22+
- uses: release-drafter/release-drafter@v5.21.0
2323
with:
2424
version: ${{github.event.inputs.version}}
2525
env:

‎.github/workflows/submodule-update.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
fi
2525
2626
- name: Checkout DefectDojo from dev
27-
uses: actions/checkout@v2
27+
uses: actions/checkout@v3
2828
if: steps.branch-target.outputs.branch == 'dev'
2929
with:
3030
ref: dev
@@ -41,7 +41,7 @@ jobs:
4141
owner: ${{ env.OWNER }}
4242

4343
- name: Checkout DefectDojo from master
44-
uses: actions/checkout@v2
44+
uses: actions/checkout@v3
4545
if: steps.branch-target.outputs.branch == 'master'
4646
with:
4747
ref: master

‎.github/workflows/test-helm-chart.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
helm dependency update ./helm/defectdojo
3636
3737
- name: Set up chart-testing
38-
uses: helm/[email protected].0
38+
uses: helm/[email protected].1
3939

4040
- name: Determine target branch
4141
id: ct-branch-target

‎Dockerfile.django‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Dockerfile.nginx to use the caching mechanism of Docker.
66

77
# Ref: https://devguide.python.org/#branchstatus
8-
FROM python:3.8.13-slim-bullseye@sha256:0e07cc072353e6b10de910d8acffa020a42467112ae6610aa90d6a3c56a74911 as base
8+
FROM python:3.8.14-slim-bullseye@sha256:8ae28a791362432b0303d485f4c9fc16479a3254f311728989e23173da9f3341 as base
99
FROM base as build
1010
WORKDIR /app
1111
RUN \

‎Dockerfile.integration-tests‎

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

22
# code: language=Dockerfile
33

4-
FROM python:3.8.13-slim-bullseye@sha256:0e07cc072353e6b10de910d8acffa020a42467112ae6610aa90d6a3c56a74911 as build
4+
FROM python:3.8.14-slim-bullseye@sha256:8ae28a791362432b0303d485f4c9fc16479a3254f311728989e23173da9f3341 as build
55
WORKDIR /app
66
RUN \
77
apt-get -y update && \

‎Dockerfile.nginx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Dockerfile.django to use the caching mechanism of Docker.
66

77
# Ref: https://devguide.python.org/#branchstatus
8-
FROM python:3.8.13-slim-bullseye@sha256:0e07cc072353e6b10de910d8acffa020a42467112ae6610aa90d6a3c56a74911 as base
8+
FROM python:3.8.14-slim-bullseye@sha256:8ae28a791362432b0303d485f4c9fc16479a3254f311728989e23173da9f3341 as base
99
FROM base as build
1010
WORKDIR /app
1111
RUN \

0 commit comments

Comments
 (0)