Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release: Merge back 2.41.0 into bugfix from: master-into-dev/2.41.0-2.42.0-dev #11359

Merged
merged 4 commits into from
Dec 2, 2024
Merged

Release: Merge back 2.41.0 into bugfix from: master-into-dev/2.41.0-2.42.0-dev #11359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06ba12a
Update versions in application files
Dec 2, 2024
14929cb
Merge pull request #11357 from DefectDojo/release/2.41.0
rossops Dec 2, 2024
fc60348
Update release step3
Maffooch Dec 2, 2024
d5d6296
Add next version release notes
Maffooch Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/release-3-master-into-dev.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading