diff --git a/CHANGELOG.txt b/CHANGELOG.txt index dd892410ac..1d6e9d3b1b 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -25,6 +25,7 @@ Changelog * Fix: Fixed Node build scripts to work on Windows (Mikalai Radchuk) * Fix: Stop breadcrumb home icon from showing as ellipsis in Chrome 60 (Matt Westcott) * Fix: Prevent `USE_THOUSAND_SEPARATOR = True` from breaking the image focal point chooser (Sævar Öfjörð Magnússon) + * Fix: Removed deprecated `SessionAuthenticationMiddleware` from project template (Samir Shah) 1.12.2 (18.09.2017) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index c3ec79cc5b..6ddb02e7fc 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -255,6 +255,7 @@ Contributors * Ben Sturmfels * Anselm Bradford * Mads Jensen +* Samir Shah Translators =========== diff --git a/docs/advanced_topics/i18n/index.rst b/docs/advanced_topics/i18n/index.rst index f925dc8470..36637de62f 100644 --- a/docs/advanced_topics/i18n/index.rst +++ b/docs/advanced_topics/i18n/index.rst @@ -53,11 +53,11 @@ Enabling multiple language support Firstly, make sure the `USE_I18N `_ Django setting is set to ``True``. -To enable multi-language support, add ``django.middleware.locale.LocaleMiddleware`` to your ``MIDDLEWARE_CLASSES``: +To enable multi-language support, add ``django.middleware.locale.LocaleMiddleware`` to your ``MIDDLEWARE``: .. code-block:: python - MIDDLEWARE_CLASSES = ( + MIDDLEWARE = ( ... 'django.middleware.locale.LocaleMiddleware', diff --git a/docs/advanced_topics/settings.rst b/docs/advanced_topics/settings.rst index 0157c6b1d7..8e562b93da 100644 --- a/docs/advanced_topics/settings.rst +++ b/docs/advanced_topics/settings.rst @@ -28,12 +28,11 @@ Middleware (``settings.py``) .. code-block:: python - MIDDLEWARE_CLASSES = [ + MIDDLEWARE = [ 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.security.SecurityMiddleware', @@ -520,12 +519,11 @@ These two files should reside in your project directory (``myproject/myproject/` ] - MIDDLEWARE_CLASSES = [ + MIDDLEWARE = [ 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.security.SecurityMiddleware', diff --git a/docs/getting_started/integrating_into_django.rst b/docs/getting_started/integrating_into_django.rst index 0387d8c247..e45e109793 100644 --- a/docs/getting_started/integrating_into_django.rst +++ b/docs/getting_started/integrating_into_django.rst @@ -35,7 +35,7 @@ In your settings file, add the following apps to ``INSTALLED_APPS``: 'modelcluster', 'taggit', -Add the following entries to ``MIDDLEWARE_CLASSES``: +Add the following entries to ``MIDDLEWARE``: .. code-block:: python diff --git a/docs/releases/1.13.rst b/docs/releases/1.13.rst index 4c262f879e..693181941a 100644 --- a/docs/releases/1.13.rst +++ b/docs/releases/1.13.rst @@ -39,6 +39,7 @@ Bug fixes * Fixed Node build scripts to work on Windows (Mikalai Radchuk) * Stop breadcrumb home icon from showing as ellipsis in Chrome 60 (Matt Westcott) * Prevent ``USE_THOUSAND_SEPARATOR = True`` from breaking the image focal point chooser (Sævar Öfjörð Magnússon) + * Removed deprecated ``SessionAuthenticationMiddleware`` from project template (Samir Shah) Upgrade considerations ====================== diff --git a/wagtail/project_template/project_name/settings/base.py b/wagtail/project_template/project_name/settings/base.py index 7c0c44fee7..5fea6e77b3 100644 --- a/wagtail/project_template/project_name/settings/base.py +++ b/wagtail/project_template/project_name/settings/base.py @@ -57,7 +57,6 @@ MIDDLEWARE = [ 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.security.SecurityMiddleware', diff --git a/wagtail/tests/settings.py b/wagtail/tests/settings.py index ed6e4a97d4..f42b17909d 100644 --- a/wagtail/tests/settings.py +++ b/wagtail/tests/settings.py @@ -94,7 +94,6 @@ if django.VERSION >= (1, 10): 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware',