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.

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

Wapiti scan importer #1206

merged 8 commits into from Jun 3, 2019


Copy link

dr3dd589 commented Jun 3, 2019

fix #1139

When submitting a pull request, please make sure you have completed the following checklist:

  • Your code is flake8 compliant (DefectDojo's code isn't currently flake8 compliant, but we're trying to correct that.)
  • If this is a new feature and not a bug fix, you've included the proper documentation in the ReadTheDocs documentation folder. or provide feature documentation in the PR.
  • Model changes should include the necessary migrations in the dojo/dd_migrations folder.
  • Add applicable tests to the unit tests.
dojo/tools/wapiti/ Outdated Show resolved Hide resolved
@dr3dd589 dr3dd589 force-pushed the dr3dd589:WapitiSupport branch from 59ba30c to 19ed190 Jun 3, 2019
dr3dd589 added 2 commits Jun 3, 2019

This comment has been minimized.

Copy link

propersam commented on 42b6bb4 Jun 3, 2019

This conflict is really a problem.

It is caused because we are all updating the same files in order to integrate our new scanner.

Not just the same file.. but the same location in the file, e.g. the bottom..

If yours or mine is merged first. The other person will still have to resolve conflicts again.

@devGregA devGregA self-requested a review Jun 3, 2019
@devGregA devGregA merged commit 3684f9b into DefectDojo:dev Jun 3, 2019
4 checks passed
4 checks passed
AccessLint Review complete
continuous-integration/travis-ci/pr The Travis CI build passed
security/snyk - components/package.json (aaronweaver (GitHub marketplace)) No manifest changes detected
security/snyk - requirements.txt (aaronweaver (GitHub marketplace)) No manifest changes detected
@aaronweaver aaronweaver referenced this pull request Jun 10, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
None yet
4 participants
You can’t perform that action at this time.