Skip to content

Commit 95ca9db

Browse files
authored
Merge pull request #14429 from DefectDojo/master-into-dev/2.56.0-2.57.0-dev
Release: Merge back 2.56.0 into dev from: master-into-dev/2.56.0-2.57.0-dev
2 parents d7e9f98 + 3b649d2 commit 95ca9db

6 files changed

Lines changed: 14 additions & 7 deletions

File tree

.github/workflows/update-sample-data.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
- cron: '0 0 1 1,4,7,10 *'
1212

1313
jobs:
14-
run-binary-and-create-pr:
14+
run-script-and-create-pr:
1515
runs-on: ubuntu-latest
1616
steps:
1717
# Checkout the repository
@@ -40,4 +40,4 @@ jobs:
4040
branch: update-sample-data
4141
base: dev
4242
title: "Update sample data"
43-
body: "This pull request updates the sample data."
43+
body: "This pull request updates the timestamps in the sample data to keep them up to date."

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.56.0-dev",
3+
"version": "2.57.0-dev",
44
"license" : "BSD-3-Clause",
55
"private": true,
66
"dependencies": {
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
title: 'Upgrading to DefectDojo Version 2.57.x'
3+
toc_hide: true
4+
weight: -20260302
5+
description: No special instructions.
6+
---
7+
There are no special instructions for upgrading to 2.57.x. Check the [Release Notes](https://github.com/DefectDojo/django-DefectDojo/releases/tag/2.57.0) for the contents of the release.

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.56.0-dev"
7+
__version__ = "2.57.0-dev"
88
__url__ = "https://github.com/DefectDojo/django-DefectDojo" # noqa: RUF067
99
__docs__ = "https://documentation.defectdojo.com" # noqa: RUF067

helm/defectdojo/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v2
2-
appVersion: "2.56.0-dev"
2+
appVersion: "2.57.0-dev"
33
description: A Helm chart for Kubernetes to install DefectDojo
44
name: defectdojo
5-
version: 1.9.15-dev
5+
version: 1.9.16-dev
66
icon: https://defectdojo.com/hubfs/DefectDojo_favicon.png
77
maintainers:
88
- name: madchap

helm/defectdojo/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ The HELM schema will be generated for you.
511511
512512
# General information about chart values
513513
514-
![Version: 1.9.15-dev](https://img.shields.io/badge/Version-1.9.15--dev-informational?style=flat-square) ![AppVersion: 2.56.0-dev](https://img.shields.io/badge/AppVersion-2.56.0--dev-informational?style=flat-square)
514+
![Version: 1.9.16-dev](https://img.shields.io/badge/Version-1.9.16--dev-informational?style=flat-square) ![AppVersion: 2.57.0-dev](https://img.shields.io/badge/AppVersion-2.57.0--dev-informational?style=flat-square)
515515
516516
A Helm chart for Kubernetes to install DefectDojo
517517

0 commit comments

Comments
 (0)