Master into dev/2.14.0 2.15.0 dev

.github/workflows/submodule-update.yml

@@ -0,0 +1,58 @@
+---
+name: Update DefectDojo Inc. Documentation
+
+on:
+  push:
+    branches: [master, dev]
+
+jobs:
+  build:
+    name: Submodule update
+    runs-on: ubuntu-latest
+    env:
+      PARENT_REPOSITORY: 'DefectDojo-Inc/Documentation'
+      OWNER: 'DefectDojo-Inc'
+
+    steps:
+      - name: Determine target branch
+        id: branch-target
+        run: |
+          if [ ! -z ${GITHUB_BASE_REF} ]; then
+            echo ::set-output name=branch::${GITHUB_BASE_REF}
+          else
+            echo ::set-output name=branch::${GITHUB_REF#refs/heads/}
+          fi
+
+      - name: Checkout DefectDojo from dev 
+        uses: actions/checkout@v2
+        if: steps.branch-target.outputs.branch == 'dev'
+        with:
+          ref: dev
+
+      - name: Create PR to Documentation repo on dev branch
+        id: create_dev_pr
+        uses: releasehub-com/github-action-create-pr-parent-submodule@v1
+        if: steps.branch-target.outputs.branch == 'dev'
+        with:
+          github_token: ${{ secrets.DOCUMENTATION_TOKEN }}
+          parent_repository: ${{ env.PARENT_REPOSITORY }}
+          checkout_branch: dev
+          pr_against_branch: dev
+          owner: ${{ env.OWNER }}
+
+      - name: Checkout DefectDojo from master 
+        uses: actions/checkout@v2
+        if: steps.branch-target.outputs.branch == 'master'
+        with:
+          ref: master
+
+      - name: Create PR to Documentation repo on master branch
+        id: create_master_pr
+        uses: releasehub-com/github-action-create-pr-parent-submodule@v1
+        if: steps.branch-target.outputs.branch == 'master'
+        with:
+          github_token: ${{ secrets.DOCUMENTATION_TOKEN }}
+          parent_repository: ${{ env.PARENT_REPOSITORY }}
+          checkout_branch: master
+          pr_against_branch: master
+          owner: ${{ env.OWNER }}

components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "defectdojo",
-  "version": "2.14.0-dev",
+  "version": "2.15.0-dev",
   "license" : "BSD-3-Clause",
   "private": true,
   "dependencies": {

dojo/__init__.py

@@ -4,6 +4,6 @@
 # Django starts so that shared_task will use this app.
 from .celery import app as celery_app  # noqa
 
-__version__ = '2.14.0-dev'
+__version__ = '2.15.0-dev'
 __url__ = 'https://github.com/DefectDojo/django-DefectDojo'
 __docs__ = 'https://defectdojo.github.io/django-DefectDojo'

helm/defectdojo/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "2.14.0-dev"
+appVersion: "2.15.0-dev"
 description: A Helm chart for Kubernetes to install DefectDojo
 name: defectdojo
-version: 1.6.37-dev
+version: 1.6.39-dev
 icon: https://www.defectdojo.org/img/favicon.ico
 maintainers:
   - name: madchap