Skip to content

Commit 3df8127

Browse files
Merge pull request #3918 from DefectDojo/release/1.13.0
Release: Merge release into master from: release/1.13.0
2 parents c60ccbe + a9e0a80 commit 3df8127

File tree

614 files changed

+301019
-11264
lines changed

Some content is hidden

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

614 files changed

+301019
-11264
lines changed

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md

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

33
Describe the feature / bug fix implemented by this PR.
4-
If this is a new parser, [the parser guide](../../doc/guide_to_parser_writing.md) may be worth (re)reading.
4+
If this is a new parser, [the parser guide](https://defectdojo.github.io/django-DefectDojo/contributing/how-to-write-a-parser/) may be worth (re)reading.
55

66
**Test results**
77

.github/workflows/cancel-outdated-workflow-runs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
timeout-minutes: 3
1515
steps:
16-
- uses: styfle/cancel-workflow-action@0.7.0
16+
- uses: styfle/cancel-workflow-action@0.8.0
1717
with:
1818
workflow_id: 'integration-tests.yml,k8s-testing.yml,unit-tests.yml'
1919
access_token: ${{ github.token }}

.github/workflows/gh-pages.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: github-pages
2+
3+
on:
4+
push:
5+
branches:
6+
- dev
7+
8+
jobs:
9+
deploy:
10+
runs-on: ubuntu-18.04
11+
steps:
12+
- uses: actions/checkout@v2
13+
with:
14+
submodules: true # Fetch Hugo themes (true OR recursive)
15+
fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod
16+
17+
- name: Setup Hugo
18+
uses: peaceiris/actions-hugo@v2
19+
with:
20+
hugo-version: '0.79.1'
21+
# extended: true
22+
23+
- name: Build
24+
run: cd docs && hugo --minify
25+
26+
- name: Deploy
27+
uses: peaceiris/actions-gh-pages@v3
28+
with:
29+
github_token: ${{ secrets.GITHUB_TOKEN }}
30+
publish_dir: ./docs/public

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
grep appVersion helm/defectdojo/Chart.yaml
5555
grep version components/package.json
5656
- name: Push version changes
57-
uses: stefanzweifel/git-auto-commit-action@v4.8.0
57+
uses: stefanzweifel/git-auto-commit-action@v4.9.0
5858
with:
5959
commit_user_name: "${{ env.GIT_USERNAME }}"
6060
commit_user_email: "${{ env.GIT_EMAIL }}"

.github/workflows/new-release-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
grep appVersion helm/defectdojo/Chart.yaml
6161
grep version components/package.json
6262
- name: Push version changes
63-
uses: stefanzweifel/git-auto-commit-action@v4.8.0
63+
uses: stefanzweifel/git-auto-commit-action@v4.9.0
6464
with:
6565
commit_user_name: "${{ env.GIT_USERNAME }}"
6666
commit_user_email: "${{ env.GIT_EMAIL }}"

.github/workflows/plantuml.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
with:
3131
args: -v -tpng ${{ steps.getfile.outputs.files }}
3232
- name: Push Local Changes
33-
uses: stefanzweifel/git-auto-commit-action@v4.8.0
33+
uses: stefanzweifel/git-auto-commit-action@v4.9.0
3434
with:
3535
commit_user_name: "PlantUML_bot"
3636
commit_user_email: "[email protected]"

.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.13.0
22+
- uses: release-drafter/release-drafter@v5.14.0
2323
with:
2424
version: ${{github.event.inputs.version}}
2525
env:

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,3 +129,5 @@ docker/extra_settings/*
129129
# Helm dependencies
130130
helm/defectdojo/charts
131131

132+
# generates files for github pages
133+
public

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "docs/themes/learn"]
2+
path = docs/themes/learn
3+
url = https://github.com/matcornic/hugo-theme-learn.git

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Here are a few things to keep in mind when making changes to DefectDojo.
1414

1515
## Writing a new parser
1616

17-
Please see [this file](doc/guide_to_parser_writing.md) for guidance on how to write a parser.
17+
Please see [the parser guide](https://defectdojo.github.io/django-DefectDojo/contributing/how-to-write-a-parser/) for guidance on how to write a parser.
1818

1919
## Modifying DefectDojo and Testing
2020

0 commit comments

Comments
 (0)