Skip to content

Release: Merge release into master from: release/2.31.4 #9631

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

Merged
Maffooch merged 5 commits into from
Feb 26, 2024
Merged

Release: Merge release into master from: release/2.31.4 #9631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a51533d
Update versions in application files
Feb 22, 2024
ba72459
Merge pull request #9617 from DefectDojo/master-into-bugfix/2.31.3-2.…
Maffooch Feb 22, 2024
27a0615
Revet psqlha version from v13 to v9 (#9630)
Maffooch Feb 26, 2024
3626414
Correct search queries containing colons (#9624)
Maffooch Feb 26, 2024
efe927b
Update versions in application files
Feb 26, 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
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.31.3",
"version": "2.31.4",
"license" : "BSD-3-Clause",
"private": true,
"dependencies": {
Expand Down
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

__version__ = '2.31.3'
__version__ = '2.31.4'
__url__ = 'https://github.com/DefectDojo/django-DefectDojo'
__docs__ = 'https://documentation.defectdojo.com'
2 changes: 1 addition & 1 deletion dojo/search/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ def parse_search_query(clean_query):

for query_part in query_parts:
if ':' in query_part:
query_part_split = query_part.split(':')
query_part_split = query_part.split(':', 1)

operator = query_part_split[0]
parameter = query_part_split[1].strip()
Expand Down
6 changes: 3 additions & 3 deletions helm/defectdojo/Chart.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ dependencies:
version: 11.6.26
- name: postgresql-ha
repository: https://charts.bitnami.com/bitnami
version: 9.1.9
version: 9.4.11
- name: rabbitmq
repository: https://charts.bitnami.com/bitnami
version: 11.2.2
- name: redis
repository: https://charts.bitnami.com/bitnami
version: 16.12.3
digest: sha256:f53ebb0cea44dfbb72ac96ae98680848acd5e17a0947a728e5646460d0da4ef9
generated: "2023-03-06T17:08:53.379497544Z"
digest: sha256:50d07c49c1fb199a70fafd032712a1d5509a0352f090bfddd2e8a22b35be0961
generated: "2024-02-15T20:24:24.560785941Z"
6 changes: 3 additions & 3 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.31.3"
appVersion: "2.31.4"
description: A Helm chart for Kubernetes to install DefectDojo
name: defectdojo
version: 1.6.111
version: 1.6.112
icon: https://www.defectdojo.org/img/favicon.ico
maintainers:
- name: madchap
Expand All @@ -18,7 +18,7 @@ dependencies:
repository: "@bitnami"
condition: postgresql.enabled
- name: postgresql-ha
version: ~9.1.5
version: ~9.4.0
repository: "@bitnami"
alias: postgresqlha
condition: postgresqlha.enabled
Expand Down