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

Jump to bottom

Syncs with upstream dev #100

Merged
merged 35 commits into from
Nov 30, 2023
Merged

Syncs with upstream dev #100

merged 35 commits into from
Nov 30, 2023

Conversation

inesmartins-swordhealth
Copy link

No description provided.

DefectDojo release bot and others added 30 commits November 13, 2023 18:10
Update versions in application files
6c55709
@Maffooch
Merge pull request #8987 from DefectDojo/master-into-bugfix/2.28.1-2.…
07415c3 
…29.0-dev

Release: Merge back 2.28.1 into bugfix from: master-into-bugfix/2.28.1-2.29.0-dev
@rndmh3ro
add trivy-dojo-operator docs (#8943)
76171af
@manuel-sommer
remove unnecessary scanfile (#8962)
152476a
@lme-nca
fix metrics to also calculate risk acceptance and duplicate findings. (…
893dfeb 
…#9013)
@dependabot
Bump boto3 from 1.29.1 to 1.29.2 (#9020)
e488563 
Bumps [boto3](https://github.com/boto/boto3) from 1.29.1 to 1.29.2.
- [Release notes](https://github.com/boto/boto3/releases)
- [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst)
- [Commits](boto/boto3@1.29.1...1.29.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@manuel-sommer
fix harbor according to issue #9014 (#9016)
b5c54ca
@Gby56
Update settings.dist.py (#8994)
c0341be
@kiblik @cneill
Docs: Split upgrade notes (#8983)
2abc29f 
* Move original file

* Split files

* Fix typos

* Add step to release workflow: ad upgrade notes

* fix '

* remove dots

* Add 2.29

* Drop empty lines

* Process ".0-dev"

* Try diff approach

* reorder + try precreate dir+file

* what is happening?

* test without touch

* touch have to be there

* It will work without touch on the right branch

* add weight

* Revert  weight, add weight to workflow

* Add description

* Typos in description

Co-authored-by: Charles Neill <1749665+cneill@users.noreply.github.com>

* Fix typo in body

Co-authored-by: Charles Neill <1749665+cneill@users.noreply.github.com>

* Fix typos

---------

Co-authored-by: Charles Neill <1749665+cneill@users.noreply.github.com>
@kiblik
Notification: Allow to send notification even if there was not change…
9ed7ee8 
… in scan (#8959)
@dependabot
Bump sqlalchemy from 2.0.22 to 2.0.23 (#8935)
41b6516 
Bumps [sqlalchemy](https://github.com/sqlalchemy/sqlalchemy) from 2.0.22 to 2.0.23.
- [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] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Update versions in application files
c52f735
@Maffooch
Merge pull request #9030 from DefectDojo/release/2.28.2
19c4e74 
Release: Merge release into master from: release/2.28.2
Update versions in application files
93c2f00
@Maffooch
Merge branch 'dev' into master-into-dev/2.28.2-2.29.0-dev
a74e798
@Maffooch
Merge pull request #9033 from DefectDojo/master-into-bugfix/2.28.2-2.…
397008d 
…29.0-dev

Release: Merge back 2.28.2 into bugfix from: master-into-bugfix/2.28.2-2.29.0-dev
@Maffooch
Merge pull request #9032 from DefectDojo/master-into-dev/2.28.2-2.29.…
d3e86f0 
…0-dev

Release: Merge back 2.28.2 into dev from: master-into-dev/2.28.2-2.29.0-dev
@FelixHernandez
fix button color in risk acceptance bug (#9008)
027ef9b 
* fix button color in risk acceptance bug

* change approach to create a new class

* fix class and color in buttons in risk acceptance

* remove unnecessary css class
@renovate
Update rabbitmq Docker tag from 3.12.8 to v3.12.9 (docker-compose.yml) (
b50f34f 
#9023)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@dependabot
Bump django-filter from 23.3 to 23.4 (#9036)
fe838ba 
Bumps [django-filter](https://github.com/carltongibson/django-filter) from 23.3 to 23.4.
- [Release notes](https://github.com/carltongibson/django-filter/releases)
- [Changelog](https://github.com/carltongibson/django-filter/blob/main/CHANGES.rst)
- [Commits](carltongibson/django-filter@23.3...23.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump humanize from 4.8.0 to 4.9.0 (#9043)
1075433 
Bumps [humanize](https://github.com/python-humanize/humanize) from 4.8.0 to 4.9.0.
- [Release notes](https://github.com/python-humanize/humanize/releases)
- [Commits](python-humanize/humanize@4.8.0...4.9.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump boto3 from 1.29.2 to 1.29.5 (#9042)
96b12eb 
Bumps [boto3](https://github.com/boto/boto3) from 1.29.2 to 1.29.5.
- [Release notes](https://github.com/boto/boto3/releases)
- [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst)
- [Commits](boto/boto3@1.29.2...1.29.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@Gby56
Improve DD_DEDUPLICATION_ALGORITHM_PER_PARSER DD_HASHCODE_FIELDS_PER_…
070b917 
…SCANNER (#9038)

* Improve DD_DEDUPLICATION_ALGORITHM_PER_PARSER DD_HASHCODE_FIELDS_PER_SCANNER

* fix flake8

* Add logger
@kiblik
UI: Show Vuln ID from tool (#9034)
80fe95c
@biennd279
Fixbug: sonarqube severity property and remove sonarqube whitespace l…
acf77e9 
…ead and trail properties (#9006)

* strip severity beforce compare

* strip more and add unittest

* remove blank line at end of file

---------

Co-authored-by: biennd4 <biennd4@vcs.com>
Update versions in application files
b3ae204
@Maffooch
Merge pull request #9055 from DefectDojo/release/2.28.3
7912214 
Release: Merge release into master from: release/2.28.3
Update versions in application files
44d3794
@Maffooch
Merge pull request #9057 from DefectDojo/master-into-dev/2.28.3-2.29.…
31d8cf2 
…0-dev

Release: Merge back 2.28.3 into dev from: master-into-dev/2.28.3-2.29.0-dev
@dependabot
Bump boto3 from 1.29.5 to 1.29.7 (#9053)
2da5b3c 
Bumps [boto3](https://github.com/boto/boto3) from 1.29.5 to 1.29.7.
- [Release notes](https://github.com/boto/boto3/releases)
- [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst)
- [Commits](boto/boto3@1.29.5...1.29.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot bot and others added 3 commits November 27, 2023 14:58
@dependabot
Bump celery from 5.3.5 to 5.3.6 (#9045)
a8b3064 
Bumps [celery](https://github.com/celery/celery) from 5.3.5 to 5.3.6.
- [Release notes](https://github.com/celery/celery/releases)
- [Changelog](https://github.com/celery/celery/blob/main/Changelog.rst)
- [Commits](celery/celery@v5.3.5...v5.3.6)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@manuel-sommer
Fix Bundler parser (#9025)
fa75e0b 
* hotfix for bundler #9024

* added comment
@manuel-sommer
hotfix for nuclei to get it back working #9017 (#9018)
c751b97
devGregA and others added 2 commits November 29, 2023 12:17
@devGregA
Update README.md (#9048)
e48605a
@cneill
Fixing README links and formatting (#9022)
69bf6e8 
* fixing up some links/etc

* formatting

* more formatting, links, etc

* formatting table HTML

* Fixing links

* typo

* formatting, links

* typo; adding Aaron Weaver to hall of fame

* reorganizing
@inesmartins-swordhealth inesmartins-swordhealth merged commit 03fc5cc into SWORDHealth:dev Nov 30, 2023
6 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
docker docs helm New Migration parser settings_changes ui unittests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.