Skip to content

Commit fb49ecd

Browse files
authored
Merge pull request #13606 from DefectDojo/master-into-bugfix/2.52.0-2.53.0-dev
Release: Merge back 2.52.0 into bugfix from: master-into-bugfix/2.52.0-2.53.0-dev
2 parents 88361c9 + 10dd753 commit fb49ecd

File tree

5 files changed

+7
-17
lines changed

5 files changed

+7
-17
lines changed

.github/workflows/slack-pr-reminder.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
if: github.repository == 'DefectDojo/django-DefectDojo' # Notify only in core repo, not in forks - it would just fail in fork
1212
steps:
1313
- name: Notify reviewers in Slack
14-
uses: DefectDojo-Inc/notify-pr-reviewers-action@be26734e06338b41be6e70ce96027a51aa9ba9c6 # master
14+
uses: DefectDojo-Inc/notify-pr-reviewers-action@master # Do not use a specific version to always get the latest updates
1515
with:
1616
owner: "DefectDojo"
1717
repository: "django-DefectDojo"

components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "defectdojo",
3-
"version": "2.52.0-dev",
3+
"version": "2.53.0-dev",
44
"license" : "BSD-3-Clause",
55
"private": true,
66
"dependencies": {

dojo/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
# Django starts so that shared_task will use this app.
55
from .celery import app as celery_app # noqa: F401
66

7-
__version__ = "2.52.0-dev"
7+
__version__ = "2.52.0"
88
__url__ = "https://github.com/DefectDojo/django-DefectDojo"
99
__docs__ = "https://documentation.defectdojo.com"

helm/defectdojo/Chart.yaml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v2
2-
appVersion: "2.52.0-dev"
2+
appVersion: "2.53.0-dev"
33
description: A Helm chart for Kubernetes to install DefectDojo
44
name: defectdojo
5-
version: 1.8.0-dev
5+
version: 1.8.1-dev
66
icon: https://defectdojo.com/hubfs/DefectDojo_favicon.png
77
maintainers:
88
- name: madchap
@@ -34,14 +34,4 @@ dependencies:
3434
# description: Critical bug
3535
annotations:
3636
artifacthub.io/prerelease: "true"
37-
artifacthub.io/changes: |
38-
- kind: changed
39-
description: DRY cloudsql-proxy
40-
- kind: changed
41-
description: Each component allow to specific image + allow digest pinning + allow different tags for Django and Nginx
42-
- kind: added
43-
description: Convert existing comments to descriptors
44-
- kind: added
45-
description: Testing on the oldest officially supported k8s
46-
- kind: added
47-
description: Checker for maximal number of celery beats
37+
artifacthub.io/changes: ""

helm/defectdojo/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ kubectl delete pvc data-defectdojo-redis-0 data-defectdojo-postgresql-0
495495
496496
# General information about chart values
497497
498-
![Version: 1.8.0-dev](https://img.shields.io/badge/Version-1.8.0--dev-informational?style=flat-square) ![AppVersion: 2.52.0-dev](https://img.shields.io/badge/AppVersion-2.52.0--dev-informational?style=flat-square)
498+
![Version: 1.8.1-dev](https://img.shields.io/badge/Version-1.8.1--dev-informational?style=flat-square) ![AppVersion: 2.53.0-dev](https://img.shields.io/badge/AppVersion-2.53.0--dev-informational?style=flat-square)
499499
500500
A Helm chart for Kubernetes to install DefectDojo
501501

0 commit comments

Comments
 (0)