Fix merge of findings - incomplete fix introduced in #5064 #5144
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
Fixes an issue introduced in DefectDojo#5064, which was supposed to fix merging. Tested and merging now works.
|
@valentijnscholten I think this should be merged before next release so the "Merge" function is really fixed. |
valentijnscholten
changed the title
valentijnscholten
changed the title
StefanFl
approved these changes
Sep 22, 2021
Maffooch
changed the title
lenyfernandez
approved these changes
Sep 23, 2021
|
fixes #4586 |
valentijnscholten
approved these changes
Sep 27, 2021
|
Thanks. I have a branch somewhere which adds an integration test for "Merge Findings". |
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.
Fixes an issue introduced in #5064, which was supposed to fix merging. Tested and merging now works.