From 69611313c99f66d9fb74352c5de1844785ea3e06 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Tue, 30 Jun 2020 10:01:50 -0400
Subject: [PATCH 01/35] Add author name and description to HTML meta

---
 .../{{cookiecutter.project_slug}}/templates/base.html         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
index cba1b7cf7..aa68ece3c 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
@@ -5,8 +5,8 @@
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <title>{% block title %}{% endraw %}{{ cookiecutter.project_name }}{% raw %}{% endblock title %}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="">
-    <meta name="author" content="">
+    <meta name="description" content="{{ cookiecutter.description }}">
+    <meta name="author" content="{{ cookiecutter.author_name }}">
 
     <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>

From 60dfb4c5d39c3d992d8bdb10ba90ad5527571f24 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 6 Jul 2020 13:20:16 -0700
Subject: [PATCH 02/35] Update pytest-sugar from 0.9.3 to 0.9.4

---
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index c537a7f50..08b4770b5 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -16,7 +16,7 @@ watchgod==0.6  # https://github.com/samuelcolvin/watchgod
 mypy==0.782  # https://github.com/python/mypy
 django-stubs==1.5.0  # https://github.com/typeddjango/django-stubs
 pytest==5.4.3  # https://github.com/pytest-dev/pytest
-pytest-sugar==0.9.3  # https://github.com/Frozenball/pytest-sugar
+pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 
 # Documentation
 # ------------------------------------------------------------------------------

From f4ce1db0b50a96406c4003572b4570d12ddb7024 Mon Sep 17 00:00:00 2001
From: Aadith PM <aadithpm@gmail.com>
Date: Fri, 17 Jul 2020 08:37:15 -0500
Subject: [PATCH 03/35] Update requirements to include django-cors-headers with
 DRF [PR #2650]

---
 {{cookiecutter.project_slug}}/requirements/base.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index ba62bae08..bf6152660 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -41,4 +41,6 @@ django-redis==4.12.1  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == "y" %}
 # Django REST Framework
 djangorestframework==3.11.0  # https://github.com/encode/django-rest-framework
+# Django CORS Headers
+django-cors-headers==0.01 # https://github.com/adamchainz/django-cors-headers
 {%- endif %}

From 15718f8088967ed6ba71403dafde5fd7d3ba1393 Mon Sep 17 00:00:00 2001
From: Aadith PM <aadithpm@gmail.com>
Date: Fri, 17 Jul 2020 08:49:59 -0500
Subject: [PATCH 04/35] Update CONTRIBUTORS.rst

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index bba9554af..cc7f0e1d6 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -44,6 +44,7 @@ Listed in alphabetical order.
   18                       `@dezoito`_
   2O4                      `@2O4`_
   a7p                      `@a7p`_
+  Aadith PM                `@aadithpm`_
   Aaron Eikenberry         `@aeikenberry`_
   Adam Bogdał              `@bogdal`_
   Adam Dobrawy             `@ad-m`_

From 1526aafab39ebbefeb577f24fe2fb8e2c5f71869 Mon Sep 17 00:00:00 2001
From: Aadith PM <aadithpm@gmail.com>
Date: Fri, 17 Jul 2020 09:07:33 -0500
Subject: [PATCH 05/35] Update CONTRIBUTORS.rst - add link to GH

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index cc7f0e1d6..875ece2ec 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -236,6 +236,7 @@ Listed in alphabetical order.
   Yuchen Xie               `@mapx`_
 ========================== ============================ ==============
 
+.. _@aadithpm: https://github.com/aadithpm
 .. _@a7p: https://github.com/a7p
 .. _@2O4: https://github.com/2O4
 .. _@ad-m: https://github.com/ad-m

From 349f7e1141c4d1461802220ce7de4aaba0862cc5 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 17 Jul 2020 07:46:56 -0700
Subject: [PATCH 06/35] Update uvicorn from 0.11.5 to 0.11.6

---
 {{cookiecutter.project_slug}}/requirements/base.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index ba62bae08..3c68b6942 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -24,7 +24,7 @@ flower==0.9.5  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn==0.11.5  # https://github.com/encode/uvicorn
+uvicorn==0.11.6  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django

From eafe74262a8c5d9e32dc1d0b8cbe643c4dc79f04 Mon Sep 17 00:00:00 2001
From: Aadith PM <aadithpm@gmail.com>
Date: Sat, 18 Jul 2020 19:53:55 -0500
Subject: [PATCH 07/35] Added django-cors-headers setup steps to base settings

---
 {{cookiecutter.project_slug}}/config/settings/base.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 7f339fadc..fe1329c4a 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -80,6 +80,7 @@ THIRD_PARTY_APPS = [
 {%- if cookiecutter.use_drf == "y" %}
     "rest_framework",
     "rest_framework.authtoken",
+    "corsheaders",
 {%- endif %}
 ]
 
@@ -134,6 +135,9 @@ AUTH_PASSWORD_VALIDATORS = [
 # https://docs.djangoproject.com/en/dev/ref/settings/#middleware
 MIDDLEWARE = [
     "django.middleware.security.SecurityMiddleware",
+{%- if cookiecutter.use_drf == 'y' %}
+    "corsheaders.middleware.CorsMiddleware",
+{%- endif %}
 {%- if cookiecutter.use_whitenoise == 'y' %}
     "whitenoise.middleware.WhiteNoiseMiddleware",
 {%- endif %}
@@ -321,6 +325,12 @@ REST_FRAMEWORK = {
     ),
     "DEFAULT_PERMISSION_CLASSES": ("rest_framework.permissions.IsAuthenticated",),
 }
+
+# django-cors-headers - https://github.com/adamchainz/django-cors-headers#setup
+CORS_URLS_REGEX = {
+    r'^/api.*$',
+}
+
 {%- endif %}
 # Your stuff...
 # ------------------------------------------------------------------------------

From 20986bafb7c83a8939c3fbd6bbe7bc1d58b6f032 Mon Sep 17 00:00:00 2001
From: Aadith PM <aadithpm@gmail.com>
Date: Sat, 18 Jul 2020 20:37:03 -0500
Subject: [PATCH 08/35] Fix style error with quotes

---
 {{cookiecutter.project_slug}}/config/settings/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index fe1329c4a..2efd2fcdd 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -328,7 +328,7 @@ REST_FRAMEWORK = {
 
 # django-cors-headers - https://github.com/adamchainz/django-cors-headers#setup
 CORS_URLS_REGEX = {
-    r'^/api.*$',
+    r"^/api.*$",
 }
 
 {%- endif %}

From ff69126087fadc479c50b27d1b1ec3b6b747e68d Mon Sep 17 00:00:00 2001
From: Aadith PM <aadithpm@gmail.com>
Date: Mon, 20 Jul 2020 11:21:06 -0500
Subject: [PATCH 09/35] Update
 {{cookiecutter.project_slug}}/config/settings/base.py

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/config/settings/base.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 2efd2fcdd..f69908c2d 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -327,9 +327,7 @@ REST_FRAMEWORK = {
 }
 
 # django-cors-headers - https://github.com/adamchainz/django-cors-headers#setup
-CORS_URLS_REGEX = {
-    r"^/api.*$",
-}
+CORS_URLS_REGEX = r"^/api/.*$"
 
 {%- endif %}
 # Your stuff...

From fee9402e4469b8532b6093b5cee5fba141cca197 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Tue, 21 Jul 2020 00:02:14 -0400
Subject: [PATCH 10/35] Use raw Jinja2 for cookiecutter template context

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 .../{{cookiecutter.project_slug}}/templates/base.html         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
index aa68ece3c..99fe27ab0 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
@@ -5,8 +5,8 @@
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <title>{% block title %}{% endraw %}{{ cookiecutter.project_name }}{% raw %}{% endblock title %}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="{{ cookiecutter.description }}">
-    <meta name="author" content="{{ cookiecutter.author_name }}">
+    <meta name="description" content="{% endraw %}{{ cookiecutter.description }}{% raw %}">
+    <meta name="author" content="{% endraw %}{{ cookiecutter.author_name }}{% raw %}">
 
     <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>

From d31ee9afe73ce9cccb0059cbe2c2239d89a7b92c Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 22 Jul 2020 07:23:20 -0700
Subject: [PATCH 11/35] Update pylint-django from 2.1.0 to 2.2.0

---
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index cbb8dc319..6024e9a58 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -29,7 +29,7 @@ flake8==3.8.3  # https://github.com/PyCQA/flake8
 flake8-isort==3.0.1  # https://github.com/gforcada/flake8-isort
 coverage==5.2  # https://github.com/nedbat/coveragepy
 black==19.10b0  # https://github.com/ambv/black
-pylint-django==2.1.0  # https://github.com/PyCQA/pylint-django
+pylint-django==2.2.0  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}

From 9bdb4335380d9cde9d14d8f766b3aee4fed31bfe Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 22 Jul 2020 10:11:16 -0700
Subject: [PATCH 12/35] Update sentry-sdk from 0.16.1 to 0.16.2

---
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index afd777b78..ca7fdc80e 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.16.1  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.16.2  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
 hiredis==1.0.1  # https://github.com/redis/hiredis-py

From fbc4491adfb6c5ec5982c62c53a02e153db6bec3 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 23 Jul 2020 03:37:15 -0700
Subject: [PATCH 13/35] Update tox from 3.17.1 to 3.18.0

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 400fa9b15..ac6c7f18d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8-isort==3.0.1
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.17.1
+tox==3.18.0
 pytest==5.4.3
 pytest-cookies==0.5.1
 pytest-instafail==0.4.2

From 689e22f5b01da10231d749a8febb252b09bfc56c Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Thu, 23 Jul 2020 22:47:20 -0400
Subject: [PATCH 14/35] Be explicit in context processor

---
 .../{{cookiecutter.project_slug}}/utils/context_processors.py  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/context_processors.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/context_processors.py
index de405076f..def96787f 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/context_processors.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/context_processors.py
@@ -2,4 +2,5 @@ from django.conf import settings
 
 
 def settings_context(_request):
-    return {"settings": settings}
+    # Be explicit
+    return {"DEBUG": settings.DEBUG}

From c57b8976b09fcd6ec7f3ef095b4b967f3d68e8d3 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Fri, 24 Jul 2020 11:29:11 -0400
Subject: [PATCH 15/35] Update
 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/context_processors.py

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 .../{{cookiecutter.project_slug}}/utils/context_processors.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/context_processors.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/context_processors.py
index def96787f..3c5351418 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/context_processors.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/context_processors.py
@@ -2,5 +2,7 @@ from django.conf import settings
 
 
 def settings_context(_request):
-    # Be explicit
+    """Settings available by default to the templates context."""
+    # Note: we intentionally do NOT expose the entire settings
+    # to prevent accidental leaking of sensitive information
     return {"DEBUG": settings.DEBUG}

From 6fffaf13cab98d4ae2682fcb58d28af406d9ec95 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 24 Jul 2020 16:54:39 +0100
Subject: [PATCH 16/35] Fix version for django-cors-headers

---
 {{cookiecutter.project_slug}}/requirements/base.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index bf6152660..c7fcc99de 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -41,6 +41,5 @@ django-redis==4.12.1  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == "y" %}
 # Django REST Framework
 djangorestframework==3.11.0  # https://github.com/encode/django-rest-framework
-# Django CORS Headers
-django-cors-headers==0.01 # https://github.com/adamchainz/django-cors-headers
+django-cors-headers==3.4.0 # https://github.com/adamchainz/django-cors-headers
 {%- endif %}

From c6dd8471dd590311460ae54bd6a8b8a4c1a346f5 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 24 Jul 2020 09:10:59 -0700
Subject: [PATCH 17/35] Update coverage from 5.2 to 5.2.1

---
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 6024e9a58..2abdf136f 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -27,7 +27,7 @@ sphinx-autobuild==0.7.1 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==3.8.3  # https://github.com/PyCQA/flake8
 flake8-isort==3.0.1  # https://github.com/gforcada/flake8-isort
-coverage==5.2  # https://github.com/nedbat/coveragepy
+coverage==5.2.1  # https://github.com/nedbat/coveragepy
 black==19.10b0  # https://github.com/ambv/black
 pylint-django==2.2.0  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 21c56bb97a59d69e71fcaebdde6d7715d25a9150 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 24 Jul 2020 17:38:29 +0100
Subject: [PATCH 18/35] Don't include base requirements with dot in front

See https://github.com/pyupio/pyup/issues/390
---
 {{cookiecutter.project_slug}}/requirements/local.txt      | 2 +-
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 2abdf136f..793d76778 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,4 +1,4 @@
--r ./base.txt
+-r base.txt
 
 Werkzeug==1.0.1 # https://github.com/pallets/werkzeug
 ipdb==0.13.3  # https://github.com/gotcha/ipdb
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index ca7fdc80e..52b5a94c4 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -1,6 +1,6 @@
 # PRECAUTION: avoid production dependencies that aren't in development
 
--r ./base.txt
+-r base.txt
 
 gunicorn==20.0.4  # https://github.com/benoitc/gunicorn
 psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2

From ed8e3073c66d70d79cd350d39b40e55763da9d24 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 24 Jul 2020 09:58:27 -0700
Subject: [PATCH 19/35] Update hiredis from 1.0.1 to 1.1.0

---
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 52b5a94c4..666c0468c 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -11,7 +11,7 @@ Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 sentry-sdk==0.16.2  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
-hiredis==1.0.1  # https://github.com/redis/hiredis-py
+hiredis==1.1.0  # https://github.com/redis/hiredis-py
 {%- endif %}
 
 # Django

From ce0f2363e01c49c5146d2239fcb15eb989cb509d Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 24 Jul 2020 09:58:28 -0700
Subject: [PATCH 20/35] Update hiredis from 1.0.1 to 1.1.0

---
 {{cookiecutter.project_slug}}/requirements/base.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 8c0394721..540f91ab7 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -14,7 +14,7 @@ whitenoise==5.1.0  # https://github.com/evansd/whitenoise
 {%- endif %}
 redis==3.5.3  # https://github.com/andymccurdy/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
-hiredis==1.0.1  # https://github.com/redis/hiredis-py
+hiredis==1.1.0  # https://github.com/redis/hiredis-py
 {%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.4.6  # pyup: < 5.0  # https://github.com/celery/celery

From 70c11fa89432815ebbe569ac1f18e19ff8047e36 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 24 Jul 2020 09:58:32 -0700
Subject: [PATCH 21/35] Update django-crispy-forms from 1.9.1 to 1.9.2

---
 {{cookiecutter.project_slug}}/requirements/base.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 8c0394721..9312680d7 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -33,7 +33,7 @@ django==3.0.8  # pyup: < 3.1  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==4.0.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.42.0  # https://github.com/pennersr/django-allauth
-django-crispy-forms==1.9.1  # https://github.com/django-crispy-forms/django-crispy-forms
+django-crispy-forms==1.9.2  # https://github.com/django-crispy-forms/django-crispy-forms
 {%- if cookiecutter.use_compressor == "y" %}
 django-compressor==2.4  # https://github.com/django-compressor/django-compressor
 {%- endif %}

From b592003f87ff4a1f27dfa01e8860bb0f725e0847 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 25 Jul 2020 14:37:54 +0100
Subject: [PATCH 22/35] Fix snippet in documentation

---
 docs/developing-locally.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index a5d598f0b..0da265484 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -24,9 +24,9 @@ First things first.
 
     $ source <virtual env path>/bin/activate
 
-#. Install cookiecutter-django
+#. Install cookiecutter-django: ::
 
-    $ cookiecutter gh:pydanny/cookiecutter-django ::
+    $ cookiecutter gh:pydanny/cookiecutter-django
 
 #. Install development requirements: ::
 

From 08a15337b35e1c11d9ef1494e9550ceaee7e9e72 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 25 Jul 2020 14:39:04 +0100
Subject: [PATCH 23/35] Update document.rst

---
 docs/document.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/document.rst b/docs/document.rst
index 990bbe8a7..15a5396e1 100644
--- a/docs/document.rst
+++ b/docs/document.rst
@@ -18,7 +18,7 @@ Navigate to port 7000 on your host to see the documentation. This will be opened
 Generate API documentation
 ----------------------------
 
-Edit the docs/_source files and project application docstrings to create your documentation.
+Edit the ``docs/_source`` files and project application docstrings to create your documentation.
 
 Sphinx can automatically include class and function signatures and docstrings in generated documentation. 
 See the generated project documentation for more examples.

From a706ab826c4685e61331e622e1382075ae5343a4 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 25 Jul 2020 12:51:33 -0700
Subject: [PATCH 24/35] Update django-anymail from 7.1.0 to 7.2

---
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 666c0468c..369ee65f6 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -22,7 +22,7 @@ django-storages[boto3]==1.9.1  # https://github.com/jschneier/django-storages
 django-storages[google]==1.9.1  # https://github.com/jschneier/django-storages
 {%- endif %}
 {%- if cookiecutter.mail_service == 'Mailgun' %}
-django-anymail[mailgun]==7.1.0  # https://github.com/anymail/django-anymail
+django-anymail[mailgun]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
 django-anymail[amazon_ses]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}

From 756031c351c7e6e24e33006c21fc3b757d755b22 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 25 Jul 2020 12:51:34 -0700
Subject: [PATCH 25/35] Update django-anymail from 7.1.0 to 7.2

---
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 369ee65f6..129e9815c 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -24,7 +24,7 @@ django-storages[google]==1.9.1  # https://github.com/jschneier/django-storages
 {%- if cookiecutter.mail_service == 'Mailgun' %}
 django-anymail[mailgun]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
-django-anymail[amazon_ses]==7.1.0  # https://github.com/anymail/django-anymail
+django-anymail[amazon_ses]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
 django-anymail[mailjet]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}

From 41dc9424f8503083d52a2808451bf9ff112d9e60 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 25 Jul 2020 12:51:35 -0700
Subject: [PATCH 26/35] Update django-anymail from 7.1.0 to 7.2

---
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 129e9815c..53c1a999d 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -26,7 +26,7 @@ django-anymail[mailgun]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
 django-anymail[amazon_ses]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
-django-anymail[mailjet]==7.1.0  # https://github.com/anymail/django-anymail
+django-anymail[mailjet]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
 django-anymail[mandrill]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}

From a5e71ab8bfe505cbe67ba34b0bd6702d2cedb453 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 25 Jul 2020 12:51:36 -0700
Subject: [PATCH 27/35] Update django-anymail from 7.1.0 to 7.2

---
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 53c1a999d..f365e2022 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -28,7 +28,7 @@ django-anymail[amazon_ses]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
 django-anymail[mailjet]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
-django-anymail[mandrill]==7.1.0  # https://github.com/anymail/django-anymail
+django-anymail[mandrill]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
 django-anymail[postmark]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}

From 14fad9247b0ab845f91d9c2e21f7483836fdba77 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 25 Jul 2020 12:51:37 -0700
Subject: [PATCH 28/35] Update django-anymail from 7.1.0 to 7.2

---
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index f365e2022..db685a890 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -30,7 +30,7 @@ django-anymail[mailjet]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
 django-anymail[mandrill]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
-django-anymail[postmark]==7.1.0  # https://github.com/anymail/django-anymail
+django-anymail[postmark]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
 django-anymail[sendgrid]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}

From 1d8f637f9d9bd7db556fff133961f1dba0f4cb7f Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 25 Jul 2020 12:51:38 -0700
Subject: [PATCH 29/35] Update django-anymail from 7.1.0 to 7.2

---
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index db685a890..9a2145e92 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -32,7 +32,7 @@ django-anymail[mandrill]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
 django-anymail[postmark]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
-django-anymail[sendgrid]==7.1.0  # https://github.com/anymail/django-anymail
+django-anymail[sendgrid]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
 django-anymail[sendinblue]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}

From 8fa56b3c6d5c3a72b9e668628921503c64d9c681 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 25 Jul 2020 12:51:39 -0700
Subject: [PATCH 30/35] Update django-anymail from 7.1.0 to 7.2

---
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 9a2145e92..cdb18b81b 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -34,7 +34,7 @@ django-anymail[postmark]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
 django-anymail[sendgrid]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
-django-anymail[sendinblue]==7.1.0  # https://github.com/anymail/django-anymail
+django-anymail[sendinblue]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
 django-anymail[sparkpost]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}

From 83290cb71073dd614957a1db884977519cabf84b Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 25 Jul 2020 12:51:40 -0700
Subject: [PATCH 31/35] Update django-anymail from 7.1.0 to 7.2

---
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index cdb18b81b..27c1a8acb 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -36,7 +36,7 @@ django-anymail[sendgrid]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
 django-anymail[sendinblue]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
-django-anymail[sparkpost]==7.1.0  # https://github.com/anymail/django-anymail
+django-anymail[sparkpost]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}
 django-anymail==7.1.0  # https://github.com/anymail/django-anymail
 {%- endif %}

From c3391c957284f6ec956a0ee2043e2389fb34e0db Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 25 Jul 2020 12:51:40 -0700
Subject: [PATCH 32/35] Update django-anymail from 7.1.0 to 7.2

---
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 27c1a8acb..5ae320073 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -38,5 +38,5 @@ django-anymail[sendinblue]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
 django-anymail[sparkpost]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}
-django-anymail==7.1.0  # https://github.com/anymail/django-anymail
+django-anymail==7.2  # https://github.com/anymail/django-anymail
 {%- endif %}

From 5500af7364e3ff0d2ead6b7100e8884e0ace785b Mon Sep 17 00:00:00 2001
From: Matthias Sieber <matthiasksieber@gmail.com>
Date: Mon, 27 Jul 2020 14:08:56 -0700
Subject: [PATCH 33/35] update Readme w/ current PostgreSQL version support

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 47f2bfb7d..ec663d3e1 100644
--- a/README.rst
+++ b/README.rst
@@ -96,7 +96,7 @@ Constraints
 -----------
 
 * Only maintained 3rd party libraries are used.
-* Uses PostgreSQL everywhere (9.4 - 11.3)
+* Uses PostgreSQL everywhere (9.4 - 12.3)
 * Environment variables for configuration (This won't work with Apache/mod_wsgi).
 
 Support this Project!

From d5d4941d2286671dd7f7eda19f0001b98dbb9095 Mon Sep 17 00:00:00 2001
From: Matthias Sieber <matthiasksieber@gmail.com>
Date: Mon, 27 Jul 2020 14:12:33 -0700
Subject: [PATCH 34/35] added to list of other contributors

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 875ece2ec..26bcec91d 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -181,6 +181,7 @@ Listed in alphabetical order.
   Matt Menzenski           `@menzenski`_
   Matt Warren              `@mfwarren`_
   Matthew Sisley           `@mjsisley`_
+  Matthias Sieber          `@manonthemat`                @MatzeOne
   Meghan Heintz            `@dot2dotseurat`_
   Mesut Yılmaz             `@myilmaz`_
   Michael Gecht            `@mimischi`_                  @_mischi

From 279175a3447b7754769a33a69441d9cd566025e0 Mon Sep 17 00:00:00 2001
From: Matthias Sieber <matthiasksieber@gmail.com>
Date: Mon, 27 Jul 2020 14:14:15 -0700
Subject: [PATCH 35/35] updated docs

---
 docs/project-generation-options.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index 1c2fc3149..ec52e2183 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -49,11 +49,11 @@ use_docker:
 postgresql_version:
     Select a PostgreSQL_ version to use. The choices are:
 
-    1. 11.3
-    2. 10.8
-    3. 9.6
-    4. 9.5
-    5. 9.4
+    1. 12.3
+    2. 11.8
+    3. 10.8
+    4. 9.6
+    5. 9.5
 
 js_task_runner:
     Select a JavaScript task runner. The choices are: