Syncs with upstream dev #116
Merged
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
…32.0-dev Release: Merge back 2.31.0 into bugfix from: master-into-bugfix/2.31.0-2.32.0-dev
* fix for sarif parser with codeql rules * add check for extensions property * flake8 comparsion
…9502) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* finding sla expiration date field (part two) * sla violation check updates * clean up of finding violates_sla property * flake8 fix * Update dojo/models.py Co-authored-by: Charles Neill <1749665+cneill@users.noreply.github.com> * Update 0201_populate_finding_sla_expiration_date.py --------- Co-authored-by: Charles Neill <1749665+cneill@users.noreply.github.com>
#9517) * Modifying Bugcrowd API Parser to align to vendor documentation on what the not_applicable state means. It is now active == False and severity == 'Info'. [sc-4217] * fixing Flake8 errors * fixing Flake8 errors, part deux
* Jira Webhook: Catch comments from other issue updates * Accommodate redirect responses * Update dojo/jira_link/views.py Co-authored-by: Charles Neill <1749665+cneill@users.noreply.github.com> * Fix syntax --------- Co-authored-by: Charles Neill <1749665+cneill@users.noreply.github.com>
* add metrics page: "Product Tag Count" It is fully based on "Product Type Count" metrics page. * fixup! add metrics page: "Product Tag Count" * Fix Flake8 * Update views.py --------- Co-authored-by: Cody Maffucci <46459665+Maffooch@users.noreply.github.com>
* Disallow duplicate tool types * Fix Flake8 * Only validate on new creations * Force new name on tool type unit test
URL redirects were behaving strangely without this leading slash. it seems it was missed when all the others were added
Release: Merge release into master from: release/2.31.1
…32.0-dev Release: Merge back 2.31.1 into bugfix from: master-into-bugfix/2.31.1-2.32.0-dev
…0-dev Release: Merge back 2.31.1 into dev from: master-into-dev/2.31.1-2.32.0-dev
* Use correct name references * fix db_mig * Update and rename 0201_alter_dojo_group_social_provider.py to 0202_alter_dojo_group_social_provider.py --------- Co-authored-by: Cody Maffucci <46459665+Maffooch@users.noreply.github.com>
…alpine (docker-compose.yml) (#9535) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
With this change, renovate will create PRs to update the helm-dependencies, just as with docker-compose. Note that only setting the repository to the full URL did not work, I also had to add the registryAlias.
…hart.yaml) (#9550) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…alpine (docker-compose.yml) (#9541) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…ml) (#9573) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Questionnaires: Correct nested object deletions * Fix Flake8
A couple fields are overwritten by DefectDojo when findings are pushed to an existing jira ticket. This can be destructive for developers in the following ways: - Priority: This field often reflects the timeline a particular issue may be fixed. Developers may have more specific context for why a vulnerability may not be as severe as initially thought. - Labels: Labels could be used to sort issues in a given queue to determine who works on a given ticket. When a finding is pushed to jira again after creation, these new labels should not be overwritten These fields should be respected to avoid stomping on any changes/process set by developers
Bumps nginx from 1.25.3-alpine to 1.25.4-alpine. --- updated-dependencies: - dependency-name: nginx 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>
Release: Merge release into master from: release/2.31.2
…0-dev Release: Merge back 2.31.2 into dev from: master-into-dev/2.31.2-2.32.0-dev
…9576) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* ✨ fix guardduty, issue #7813 * advance unittests * add mitigation * provide more information * uniqueidfromtool not in description * flake8 * update docs * update docs * update docs * update according to review * adapt docs * 🐛 fix according to comment * 🐛 fix wrong merge conflict resolal
inesmartins-swordhealth
merged commit 0c20505
into
SWORDHealth:dev
6 of 9 checks passed
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.
No description provided.