Skip to content

Commit

Permalink
Merge pull request #11359 from DefectDojo/master-into-dev/2.41.0-2.42…
Browse files Browse the repository at this point in the history
….0-dev

Release: Merge back 2.41.0 into bugfix from: master-into-dev/2.41.0-2.42.0-dev
  • Loading branch information
rossops authored Dec 2, 2024
2 parents 81e650c + d5d6296 commit 62bec0e
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release-3-master-into-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ jobs:
description: No special instructions.
---
There are no special instructions for upgrading to $minorv.x. Check the [Release Notes](https://github.com/DefectDojo/django-DefectDojo/releases/tag/$patchv) for the contents of the release.
" > docs/content/en/getting_started/upgrading/$minorv.md
git add docs/content/en/getting_started/upgrading/$minorv.md
" > docs/content/en/open_source/upgrading/$minorv.md
git add docs/content/en/open_source/upgrading/$minorv.md
if: endsWith(github.event.inputs.release_number_new, '.0') && endsWith(github.event.inputs.release_number_dev, '.0-dev')

- name: Push version changes
Expand Down
2 changes: 1 addition & 1 deletion components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "defectdojo",
"version": "2.41.0-dev",
"version": "2.41.0",
"license" : "BSD-3-Clause",
"private": true,
"dependencies": {
Expand Down
7 changes: 7 additions & 0 deletions docs/content/en/open_source/upgrading/2.42.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
title: 'Upgrading to DefectDojo Version 2.42.x'
toc_hide: true
weight: -20241104
description: No special instructions.
---
There are no special instructions for upgrading to 2.42.x. Check the [Release Notes](https://github.com/DefectDojo/django-DefectDojo/releases/tag/2.42.0) for the contents of the release.
2 changes: 1 addition & 1 deletion dojo/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
# Django starts so that shared_task will use this app.
from .celery import app as celery_app # noqa: F401

__version__ = "2.41.0-dev"
__version__ = "2.41.0"
__url__ = "https://github.com/DefectDojo/django-DefectDojo"
__docs__ = "https://documentation.defectdojo.com"
4 changes: 2 additions & 2 deletions helm/defectdojo/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
appVersion: "2.41.0-dev"
appVersion: "2.41.0"
description: A Helm chart for Kubernetes to install DefectDojo
name: defectdojo
version: 1.6.162-dev
version: 1.6.162
icon: https://www.defectdojo.org/img/favicon.ico
maintainers:
- name: madchap
Expand Down

0 comments on commit 62bec0e

Please sign in to comment.