Skip to content

Commit

Permalink
Merge branch 'master' into snyk-upgrade-923ecd71398eaf21ef88b83958442f65
Browse files Browse the repository at this point in the history
  • Loading branch information
drakeg committed Feb 4, 2020
2 parents bc4ba5f + 6f43c23 commit 0ed0aa0
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 14 deletions.
8 changes: 8 additions & 0 deletions .whitesource
@@ -0,0 +1,8 @@
{
"checkRunSettings": {
"vulnerableCheckRunConclusionLevel": "failure"
},
"issueSettings": {
"minSeverityLevel": "LOW"
}
}
6 changes: 3 additions & 3 deletions final_project/frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion final_project/frontend/package.json
Expand Up @@ -9,8 +9,8 @@
},
"dependencies": {
"core-js": "^3.4.5",
"serialize-javascript": "^2.1.1",
"vue": "^2.6.11",
"serialize-javascript": "^2.1.2",
"vue-router": "^3.1.3"
},
"devDependencies": {
Expand Down
20 changes: 10 additions & 10 deletions requirements.txt
@@ -1,31 +1,31 @@
astroid==2.3.3
autopep8==1.4.4
autopep8==1.5
certifi==2019.11.28
chardet==3.0.4
colorama==0.4.1
colorama==0.4.3
confusable-homoglyphs==3.2.0
defusedxml==0.6.0
Django==3.0
django-allauth==0.40.0
Django==3.0.3
django-allauth==0.41.0
django-crispy-forms==1.8.1
django-registration==3.0.1
django-registration==3.1
django-rest-auth==0.9.5
django-webpack-loader==0.6.0
djangorestframework==3.10.3
djangorestframework==3.11.0
idna==2.8
isort==4.3.21
lazy-object-proxy==1.4.3
mccabe==0.6.1
oauthlib==3.1.0
Pillow==6.2.1
Pillow==7.0.0
pycodestyle==2.5.0
pylint==2.4.4
python3-openid==3.1.0
pytz==2019.3
requests==2.22.0
requests-oauthlib==1.3.0
six==1.13.0
six==1.14.0
sqlparse==0.3.0
typed-ast==1.4.0
urllib3==1.25.7
typed-ast==1.4.1
urllib3==1.25.8
wrapt==1.11.2

0 comments on commit 0ed0aa0

Please sign in to comment.