Merge pull request #718 from simpsonw/django_update

Update to Django 1.11.23
cyverse · Aug 29, 2019 · 2ea5f57 · 2ea5f57
2 parents 52beb90 + 8b066fd
commit 2ea5f57
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 -->
 
 ## [Unreleased](https://github.com/cyverse/atmosphere/compare/v36-3...HEAD) - YYYY-MM-DD
+### Security
+  - Update to Django 1.11.23
+    ([#718](https://github.com/cyverse/atmosphere/pull/718))
 
 
 ## [v36-3](https://github.com/cyverse/atmosphere/compare/v36-2...HEAD) - 2019-08-08

diff --git a/dev_requirements.txt b/dev_requirements.txt
@@ -50,7 +50,7 @@ django-memoize==2.1.0
 django-nose==1.4.4
 django-redis-cache==1.7.1
 django-sslserver==0.20
-django==1.11.22
+django==1.11.23
 djangorestframework-csv==2.0.0
 djangorestframework-jsonp==1.0.2
 djangorestframework-xml==1.3.0

diff --git a/requirements.in b/requirements.in
@@ -1,7 +1,7 @@
 ansible<2.8
 business_rules
 colorama # used by ./configure
-django>=1.11.21
+django>=1.11.23
 django-cors-headers
 django-sslserver #NOTE: Debugs requests real-time.
 djangorestframework>=3.9.1

diff --git a/requirements.txt b/requirements.txt
@@ -37,7 +37,7 @@ django-filter==1.0.4
 django-memoize==2.1.0
 django-redis-cache==1.7.1
 django-sslserver==0.20
-django==1.11.22
+django==1.11.23
 djangorestframework-csv==2.0.0
 djangorestframework-jsonp==1.0.2
 djangorestframework-xml==1.3.0