Skip to content
This repository has been archived by the owner on Oct 2, 2023. It is now read-only.

[pull] master from DefectDojo:master #203

Merged
merged 316 commits into from
Sep 11, 2023
Merged

[pull] master from DefectDojo:master #203

merged 316 commits into from
Sep 11, 2023

Conversation

pull[bot]
Copy link

@pull pull bot commented Jun 26, 2023

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

dependabot bot and others added 12 commits June 27, 2023 12:57
Bumps [redis](https://github.com/redis/redis-py) from 4.5.5 to 4.6.0.
- [Release notes](https://github.com/redis/redis-py/releases)
- [Changelog](https://github.com/redis/redis-py/blob/master/CHANGES)
- [Commits](redis/redis-py@v4.5.5...v4.6.0)

---
updated-dependencies:
- dependency-name: redis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [sqlalchemy](https://github.com/sqlalchemy/sqlalchemy) from 2.0.16 to 2.0.17.
- [Release notes](https://github.com/sqlalchemy/sqlalchemy/releases)
- [Changelog](https://github.com/sqlalchemy/sqlalchemy/blob/main/CHANGES.rst)
- [Commits](https://github.com/sqlalchemy/sqlalchemy/commits)

---
updated-dependencies:
- dependency-name: sqlalchemy
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
For some reason, I have seen cases where the product exists, but is not fetched by the `get_target_product_if_exists` function, but it does exist. 

Updating the `create` function to `get_or_create` makes this process safer across the board
…8325)

* Added more-header nginx plugin & removed 'Server' response header

* Removed installation of the more headers nginx plugin as it is incompatible with the installed nginx

* Removed unit test as nginx is not responding in unit tests

---------

Co-authored-by: Felix Hoeborn <[email protected]>
* Fix validators, add tests

* Flake8, pep8
Merge Bugfix into Dev - 2.24.0
Release: Merge release into master from: release/2.24.0
FelixHernandez and others added 29 commits August 29, 2023 13:36
* Fix checkbox disappear findings (windows resize)

* fix checkboxes disappear in all project

* fix 500 error when attempting to order tags

* fix flake8 issue

---------

Co-authored-by: Felix Hernandez <[email protected]>
Release: Merge release into master from: release/2.25.4
…26.0-dev

Release: Merge back 2.25.4 into bugfix from: master-into-bugfix/2.25.4-2.26.0-dev
…0-dev

Release: Merge back 2.25.4 into dev from: master-into-dev/2.25.4-2.26.0-dev
…ackage.json) (#8575)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Bumps [celery](https://github.com/celery/celery) from 5.3.1 to 5.3.3.
- [Release notes](https://github.com/celery/celery/releases)
- [Changelog](https://github.com/celery/celery/blob/main/Changelog.rst)
- [Commits](celery/celery@v5.3.1...v5.3.3)

---
updated-dependencies:
- dependency-name: celery
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [django-environ](https://github.com/joke2k/django-environ) from 0.10.0 to 0.11.1.
- [Release notes](https://github.com/joke2k/django-environ/releases)
- [Changelog](https://github.com/joke2k/django-environ/blob/main/CHANGELOG.rst)
- [Commits](joke2k/django-environ@v0.10.0...v0.11.1)

---
updated-dependencies:
- dependency-name: django-environ
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [boto3](https://github.com/boto/boto3) from 1.28.36 to 1.28.39.
- [Release notes](https://github.com/boto/boto3/releases)
- [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst)
- [Commits](boto/boto3@1.28.36...1.28.39)

---
updated-dependencies:
- dependency-name: boto3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [celery](https://github.com/celery/celery) from 5.3.3 to 5.3.4.
- [Release notes](https://github.com/celery/celery/releases)
- [Changelog](https://github.com/celery/celery/blob/main/Changelog.rst)
- [Commits](https://github.com/celery/celery/commits/v5.3.4)

---
updated-dependencies:
- dependency-name: celery
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps nginx from `cac882b` to `16164a4`.

---
updated-dependencies:
- dependency-name: nginx
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [django-environ](https://github.com/joke2k/django-environ) from 0.11.1 to 0.11.2.
- [Release notes](https://github.com/joke2k/django-environ/releases)
- [Changelog](https://github.com/joke2k/django-environ/blob/main/CHANGELOG.rst)
- [Commits](joke2k/django-environ@v0.11.1...v0.11.2)

---
updated-dependencies:
- dependency-name: django-environ
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [boto3](https://github.com/boto/boto3) from 1.28.39 to 1.28.40.
- [Release notes](https://github.com/boto/boto3/releases)
- [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst)
- [Commits](boto/boto3@1.28.39...1.28.40)

---
updated-dependencies:
- dependency-name: boto3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…rkflows/test-helm-chart.yml) (#8601)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Bumps [gitpython](https://github.com/gitpython-developers/GitPython) from 3.1.32 to 3.1.34.
- [Release notes](https://github.com/gitpython-developers/GitPython/releases)
- [Changelog](https://github.com/gitpython-developers/GitPython/blob/main/CHANGES)
- [Commits](gitpython-developers/GitPython@3.1.32...3.1.34)

---
updated-dependencies:
- dependency-name: gitpython
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Merge Bugfix -> Dev (2.26.0)
Release: Merge release into master from: release/2.26.0
…27.0-dev

Release: Merge back 2.26.0 into bugfix from: master-into-bugfix/2.26.0-2.27.0-dev
* Fix checkbox disappear findings (windows resize)

* fix checkboxes disappear in all project

* fix 500 error when attempting to order tags

* fix flake8 issue

* Fix Bulk edit drop-down bug

* trivy parser Includes causeMetadata in the findings description

* Revert "trivy parser Includes causeMetadata in the findings description"

This reverts commit da493b9.

---------

Co-authored-by: Felix Hernandez <[email protected]>
* Fix checkbox disappear findings (windows resize)

* fix checkboxes disappear in all project

* fix 500 error when attempting to order tags

* fix flake8 issue

* Fix Bulk edit drop-down bug

* trivy parser Includes causeMetadata in the findings description

* Revert "trivy parser Includes causeMetadata in the findings description"

This reverts commit da493b9.

* fix enable jira integration bugfix

* remove change from PR

* restore model and validate from clean method

---------

Co-authored-by: Felix Hernandez <[email protected]>
* Update parser.py

Field type mismatch is preventing results from being imported correctly.

adeptex/whispers#100

This change resolves the issue.

* Lint
Release: Merge release into master from: release/2.26.1
@pull pull bot merged commit a5fbbf7 into cloudbees:master Sep 11, 2023
1 check passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.