Skip to content

Commit 612a0f6

Browse files
MaffoochMaffooch
authored
Merge pull request DefectDojo#6237 from DefectDojo/release/2.10.0
Release: Merge release into master from: release/2.10.0
2 parents fef0d19 + 83a1831 commit 612a0f6

File tree

137 files changed

+16548
-799
lines changed

Some content is hidden

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

137 files changed

+16548
-799
lines changed

‎.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/[email protected].0
36+
uses: stefanzweifel/[email protected].1
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/[email protected].0
71+
uses: stefanzweifel/[email protected].1
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/[email protected].0
52+
uses: stefanzweifel/[email protected].1
5353
with:
5454
commit_user_name: "${{ env.GIT_USERNAME }}"
5555
commit_user_email: "${{ env.GIT_EMAIL }}"

‎Dockerfile.nginx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ COPY dojo/ ./dojo/
7272

7373
RUN env DD_SECRET_KEY='.' python3 manage.py collectstatic --noinput && true
7474

75-
FROM nginx:1.21.6-alpine@sha256:44e208ac2000daeff77c27a409d1794d6bbdf52067de627c2da13e36c7d59582
75+
FROM nginx:1.21.6-alpine@sha256:5a0df7fb7c8c03e4158ae9974bfbd6a15da2bdfdeded4fb694367ec812325d31
7676
ARG uid=1001
7777
ARG appuser=defectdojo
7878
COPY --from=collectstatic /app/static/ /usr/share/nginx/html/static/

‎README.md‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,6 @@ Moderators can help you with pull requests or feedback on dev ideas:
9595
maintainer for years. He performed Dojo's first UI overhaul, optimized code structure/features, and added numerous enhancements.
9696

9797

98-
## Sponsors
99-
[<img src="https://raw.githubusercontent.com/DefectDojo/django-DefectDojo/dev/docs/static/images/10Security-logo.png" github-user="devgrega" alt="10Security" height="65"/>](https://10security.com)
100-
[<img src="https://raw.githubusercontent.com/DefectDojo/django-DefectDojo/dev/docs/static/images/isaac.png" github-user="valentijnscholten" alt="ISAAC" height="80"/>](https://isaac.nl)
101-
[<img src="https://raw.githubusercontent.com/DefectDojo/django-DefectDojo/dev/docs/static/images/timo-pagel-logo.png" github-user="wurstbot" alt="Tim Pagel" height="65" />](https://pagel.pro/)
102-
[<img src="https://raw.githubusercontent.com/DefectDojo/django-DefectDojo/dev/docs/static/images/cloudbees-logo.png" github-user="madchap" alt="Cloudbees" height="65" />](https://cloudbees.com/)
103-
[<img src="https://raw.githubusercontent.com/DefectDojo/django-DefectDojo/dev/docs/static/images/arrival.png" github-user="ansidorov" alt="ARRIVAL" height="65" />](https://arrival.com)
104-
[<img src="https://raw.githubusercontent.com/DefectDojo/django-DefectDojo/dev/docs/static/images/WHP.png" github-user="mtesauro" alt="WeHackPurle" height="120" />](https://wehackpurple.com/)
105-
[<img src="https://raw.githubusercontent.com/DefectDojo/django-DefectDojo/dev/docs/static/images/maibornwolff-logo.png" github-user="StefanFl" alt="MiabornWolff" height="120" />]((https://www.maibornwolff.de/en))
106-
10798
## Security
10899

109100
Please report Security issues via our [disclosure policy](readme-docs/SECURITY.md).

‎components/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "defectdojo",
3-
"version": "2.9.1",
3+
"version": "2.10.0",
44
"license" : "BSD-3-Clause",
55
"private": true,
66
"dependencies": {
@@ -32,10 +32,10 @@
3232
"jquery.cookie": "1.4.1",
3333
"jquery.flot.tooltip": "^0.9.0",
3434
"jquery.hotkeys": "jeresig/jquery.hotkeys#master",
35-
"jszip": "^3.9.0",
35+
"jszip": "^3.9.1",
3636
"justgage": "^1.5.1",
3737
"metismenu": "~3.0.7",
38-
"moment": "^2.29.2",
38+
"moment": "^2.29.3",
3939
"morris.js": "morrisjs/morris.js",
4040
"pdfmake": "^0.2.5",
4141
"startbootstrap-sb-admin-2": "1.0.7"

‎components/yarn.lock‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -715,10 +715,10 @@ jquery.hotkeys@jeresig/jquery.hotkeys#master:
715715
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
716716
integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
717717

718-
jszip@^3.9.0:
719-
version "3.9.0"
720-
resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.9.0.tgz#511b26718aca5f3a553d1f8e072dfd0efdc74481"
721-
integrity sha512-Vb3SMfASUN1EKrFzv5A5+lTaZnzLzT5E6A9zyT7WFqMSfhT2Z7iS5FgSOjx2Olm3MDj8OqKj6GHyP2kMt1Ir6w==
718+
jszip@^3.9.1:
719+
version "3.9.1"
720+
resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.9.1.tgz#784e87f328450d1e8151003a9c67733e2b901051"
721+
integrity sha512-H9A60xPqJ1CuC4Ka6qxzXZeU8aNmgOeP5IFqwJbQQwtu2EUYxota3LdsiZWplF7Wgd9tkAd0mdu36nceSaPuYw==
722722
dependencies:
723723
lie "~3.3.0"
724724
pako "~1.0.2"
@@ -776,10 +776,10 @@ minimist@^1.1.3:
776776
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
777777
integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
778778

779-
moment@^2.29.2:
780-
version "2.29.2"
781-
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.2.tgz#00910c60b20843bcba52d37d58c628b47b1f20e4"
782-
integrity sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==
779+
moment@^2.29.3:
780+
version "2.29.3"
781+
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.3.tgz#edd47411c322413999f7a5940d526de183c031f3"
782+
integrity sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==
783783

784784
morris.js@morrisjs/morris.js:
785785
version "0.5.1"

‎dc-build.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#/bin/bash
22

3+
bash ./docker/docker-compose-check.sh
4+
if [[ $? -eq 1 ]]; then exit 1; fi
5+
36
if [ $# -eq 0 ]
47
then
58
echo "Building docker compose"

‎dc-down.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#/bin/bash
22

3+
bash ./docker/docker-compose-check.sh
4+
if [[ $? -eq 1 ]]; then exit 1; fi
5+
36
if [ $# -eq 0 ]
47
then
58
echo "Stopping docker compose and removing containers"

‎dc-stop.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#/bin/bash
22

3+
bash ./docker/docker-compose-check.sh
4+
if [[ $? -eq 1 ]]; then exit 1; fi
5+
36
if [ $# -eq 0 ]
47
then
58
echo "Stopping docker compose"

0 commit comments

Comments
 (0)