Merge pull request #781 from uktrade/master

Merge master into develop hotfix
uktrade · Feb 4, 2020 · 75f53e7 · 75f53e7
2 parents cffd7f8 + 3b2eb22
commit 75f53e7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,13 @@
 
 - XOT-1285 madb content markdown field
 
+## [2020.02.04](https://github.com/uktrade/directory-cms/releases/tag/2020.02.04)
+[Full Changelog](https://github.com/uktrade/directory-cms/compare/2020.01.29...2020.02.04)
+
+### Hotfix
+
+- No ticket - Upgrade Django to fix security vulnerability
+
 ## [2020.01.29](https://github.com/uktrade/directory-cms/releases/tag/2020.01.29)
 [Full Changelog](https://github.com/uktrade/directory-cms/compare/2020.01.20...2020.01.29)
 

diff --git a/requirements.txt b/requirements.txt
@@ -31,7 +31,7 @@ django-redis==4.10.0
 django-staff-sso-client==1.0.0
 django-taggit==0.24.0     # via wagtail
 django-treebeard==4.3     # via wagtail
-django==2.2.8
+django==2.2.10
 django_storages==1.7.1
 djangorestframework==3.9.4
 docopt==0.6.2             # via notifications-python-client
@@ -68,7 +68,7 @@ requests==2.21.0
 s3transfer==0.1.13        # via boto3
 sentry-sdk==0.13.4
 sigauth==4.1.0
-six==1.13.0               # via bleach, html5lib, jsonschema, mohawk, pyrsistent, w3lib, wagtail
+six==1.13.0               # via bleach, html5lib, jsonschema, mohawk, pyrsistent, python-dateutil, w3lib, wagtail
 sqlparse==0.3.0           # via django
 unidecode==1.1.1          # via wagtail
 urllib3==1.24.3

diff --git a/requirements_test.txt b/requirements_test.txt
@@ -36,7 +36,7 @@ django-redis==4.10.0
 django-staff-sso-client==1.0.0
 django-taggit==0.23.0     # via wagtail
 django-treebeard==4.3     # via wagtail
-django==2.2.8
+django==2.2.10
 django_storages==1.7.1
 djangorestframework==3.9.4
 docopt==0.6.2             # via coveralls, notifications-python-client
@@ -90,7 +90,7 @@ requests==2.21.0
 s3transfer==0.1.13        # via boto3
 sentry-sdk==0.13.4
 sigauth==4.1.0
-six==1.12.0               # via bleach, faker, freezegun, html5lib, jsonschema, mohawk, more-itertools, packaging, pip-tools, pyrsistent, requests-mock, w3lib, wagtail
+six==1.12.0               # via bleach, faker, freezegun, html5lib, jsonschema, mohawk, more-itertools, packaging, pip-tools, pyrsistent, python-dateutil, requests-mock, w3lib, wagtail
 sqlparse==0.2.4           # via django, django-debug-toolbar
 termcolor==1.1.0          # via pytest-sugar
 text-unidecode==1.2       # via faker