Release: Merge release into master from: release/2.5.0 #5564
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Release: Merge back 2.4.0 into dev from: master-into-dev/2.4.0-2.5.0-dev
Bumps [google-auth](https://github.com/googleapis/google-auth-library-python) from 2.3.2 to 2.3.3. - [Release notes](https://github.com/googleapis/google-auth-library-python/releases) - [Changelog](https://github.com/googleapis/google-auth-library-python/blob/main/CHANGELOG.md) - [Commits](googleapis/google-auth-library-python@v2.3.2...v2.3.3) --- updated-dependencies: - dependency-name: google-auth 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>
Bumps [django-imagekit](https://github.com/matthewwithanm/django-imagekit) from 4.0.2 to 4.1.0. - [Release notes](https://github.com/matthewwithanm/django-imagekit/releases) - [Commits](matthewwithanm/django-imagekit@4.0.2...4.1.0) --- updated-dependencies: - dependency-name: django-imagekit 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>
* allow import/reimport by names * cleanup * cleanup * update docs * improvements * cleanup 2 * cleanup 2 * php inventory changes * Update dojo/api_v2/views.py Co-authored-by: Stefan Fleckenstein <stefan.fleckenstein@maibornwolff.de> * Update dojo/api_v2/views.py Co-authored-by: Stefan Fleckenstein <stefan.fleckenstein@maibornwolff.de> * cleanup 3.0 * cleanup 3.0 * cleanup 3.0 Co-authored-by: Stefan Fleckenstein <stefan.fleckenstein@maibornwolff.de>
Bumps [google-api-python-client](https://github.com/googleapis/google-api-python-client) from 2.28.0 to 2.29.0. - [Release notes](https://github.com/googleapis/google-api-python-client/releases) - [Changelog](https://github.com/googleapis/google-api-python-client/blob/main/CHANGELOG.md) - [Commits](googleapis/google-api-python-client@v2.28.0...v2.29.0) --- updated-dependencies: - dependency-name: google-api-python-client 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>
merge master into dev
Update test-helm-chart.yml
Update test-helm-chart.yml
Update test-helm-chart.yml
Bumps [lxml](https://github.com/lxml/lxml) from 4.6.3 to 4.6.4. - [Release notes](https://github.com/lxml/lxml/releases) - [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt) - [Commits](lxml/lxml@lxml-4.6.3...lxml-4.6.4) --- updated-dependencies: - dependency-name: lxml 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>
…27.0 (helm/defectdojo/values.yaml) (#5375) Co-authored-by: Renovate Bot <bot@renovateapp.com>
Release: Merge back 2.4.1 into dev from: master-into-dev/2.4.1-2.5.0-dev
update demo password
Bumps [django-watson](https://github.com/etianen/django-watson) from 1.5.5 to 1.6.0. - [Release notes](https://github.com/etianen/django-watson/releases) - [Changelog](https://github.com/etianen/django-watson/blob/master/CHANGELOG.markdown) - [Commits](etianen/django-watson@release-1.5.5...release-1.6.0) --- updated-dependencies: - dependency-name: django-watson 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>
#5392) Co-authored-by: Renovate Bot <bot@renovateapp.com>
workflow updates
* pages for master and dev * pages for master and dev
merge mast into dev after github pages changes
Bumps [numpy](https://github.com/numpy/numpy) from 1.21.3 to 1.21.4. - [Release notes](https://github.com/numpy/numpy/releases) - [Changelog](https://github.com/numpy/numpy/blob/main/doc/HOWTO_RELEASE.rst.txt) - [Commits](numpy/numpy@v1.21.3...v1.21.4) --- updated-dependencies: - dependency-name: numpy 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>
master into dev
* Resolve failing integration test if user existed. Added is_help_message_present for .help-block Used non-deprecated selector * Ensure test_user_notificaitons_change tests changes and not just selecting. Test is now idempotent instead of just working first time. * Removing integration test with missing test file. Removal based on existing read-only tests within user_test.py and lack of test in GitHub Actions. * Remove trailing whitespace * Restore entrypoint-integration-tests.sh
* main(tests): remove rabbitmq from unit-tests service * main(tests): remove rabbitmq from unit-tests * fix(tests): overwrite broker values from dockerfile
Bumps [pdfmake](https://github.com/bpampuch/pdfmake) from 0.2.2 to 0.2.3. - [Release notes](https://github.com/bpampuch/pdfmake/releases) - [Changelog](https://github.com/bpampuch/pdfmake/blob/0.2.3/CHANGELOG.md) - [Commits](bpampuch/pdfmake@0.2.2...0.2.3) --- updated-dependencies: - dependency-name: pdfmake 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>
Bumps [google-api-python-client](https://github.com/googleapis/google-api-python-client) from 2.31.0 to 2.32.0. - [Release notes](https://github.com/googleapis/google-api-python-client/releases) - [Changelog](https://github.com/googleapis/google-api-python-client/blob/main/CHANGELOG.md) - [Commits](googleapis/google-api-python-client@v2.31.0...v2.32.0) --- updated-dependencies: - dependency-name: google-api-python-client 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>
* Move unit test leftovers * fix for FlexibleImportTestAPI * fix for the fix
* Update express_new_jira.html * remove duplicate block.super
#5541) * Update rabbitmq Docker tag from 3.9.10 to v3.9.11 (docker-compose.yml) * Update docker-compose.yml not sure what happened, maybe they republished with a different image/checksum Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: valentijnscholten <valentijnscholten@gmail.com>
…sers (#5518) * remove authorized users * rename db migration after rebase * release notes * bugfix for missed staff legacy removal * flake8 * more flake8 * next flake8 * added removal of user migration to release notes * rename db migration after rebase
* use GHA caching for integration tests * Update integration-tests.yml
…mpose.yml) (#5546) Co-authored-by: Renovate Bot <bot@renovateapp.com>
* Add support for files in generic parser * Update models.py * Add documentation * Update docs/content/en/integrations/import.md Co-authored-by: Stefan Fleckenstein <stefan.fleckenstein@maibornwolff.de> * Update docs/content/en/integrations/import.md Co-authored-by: Stefan Fleckenstein <stefan.fleckenstein@maibornwolff.de> * Update docs/content/en/integrations/import.md Co-authored-by: Stefan Fleckenstein <stefan.fleckenstein@maibornwolff.de> * changes after move of unit tests Co-authored-by: Stefan Fleckenstein <stefan.fleckenstein@maibornwolff.de>
* Smart Import * cleanup * fix push to jira logic * add docs * add jira testcases * comments * create ci/cd engagements * fix target start/end * cleanup * set owner for created models * autocreate for reimport * cleanup * reimport authz tests * cleanup * add docs * update unit test paths * update unit test paths * update unit test paths * fix unit tests * fix metatdata dict code * fix tests * fix merge artifacts * fix merge artifacts
* Add asynchronous re/imports (disabled by default) * Fix Flake8 Violations * Update unit tests * Update importer.py * Update progress typo
* Update views.py * Update views.py * Update views.py
* Update nginx.conf fix alias path * Update nginx_TLS.conf fix alias path
* Respect `scan_date` at import time for all findings imported * Update scan_date set logic * Add more unit tests * Remove first attempt at unit test * Add documentation and set default import date to be timezone considerate * Make scan_date optional field * Update test_importers_importer.py * Update api scan_date validation * Fix required false issue * Update docs title * Remove default date from unit tests
Maffooch
added a commit
that referenced
this pull request
Dec 7, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Release triggered by
Maffooch