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

Whitesource Importer #1243

Merged
merged 3 commits into from Jun 12, 2019

Conversation

@dr3dd589
Copy link
Member

dr3dd589 commented Jun 11, 2019

fix #1212

**Note: DefectDojo is now on Python3 and Django 2.2. Please submit your pull requests to the 'python3_dev' branch as the 'dev' branch is only for bug fixes. Any PR's submitted to the 'dev' branch should also be converted to Python3 and submited to the 'python3_dev' branch.

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

  • Your code is flake8 compliant
  • If this is a new feature and not a bug fix, you've included the proper documentation in the ReadTheDocs documentation folder. https://github.com/DefectDojo/Documentation/tree/master/docs or provide feature documentation in the PR.
  • Model changes must include the necessary migrations in the dojo/dd_migrations folder.
  • Add applicable tests to the unit tests.
@Maffooch

This comment has been minimized.

Copy link
Collaborator

Maffooch commented Jun 12, 2019

python3 branch has some issues with tests run by travis. Working on getting them sorted out. Hang tight.

@Maffooch

This comment has been minimized.

Copy link
Collaborator

Maffooch commented Jun 12, 2019

@dr3dd589 Your PR should pass now. A pull and push should do the trick. Thanks for the patience.

@dr3dd589

This comment has been minimized.

Copy link
Member Author

dr3dd589 commented Jun 12, 2019

thanks, @Maffooch Done!

@Maffooch Maffooch merged commit 208b05b into DefectDojo:python3_dev Jun 12, 2019
4 checks passed
4 checks passed
AccessLint Review complete
continuous-integration/travis-ci/pr The Travis CI build passed
Details
security/snyk - components/package.json (aaronweaver (GitHub marketplace)) No manifest changes detected
security/snyk - requirements.txt (aaronweaver (GitHub marketplace)) No manifest changes detected
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.