summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-12-11 12:43:02 -0500
committerTim Graham <timograham@gmail.com>2015-12-11 12:43:02 -0500
commit59f861fcb49a43acfbf2f75e683a7cb971600f52 (patch)
treea428f559e8cc3287b1501c458da939b9d2f84326
parentffcdb0b471d0afc72b42b0a2b0c0c4fb45d7b6b1 (diff)
Fixed #25918 -- Removed unused LOGOUT_URL setting.
Thanks hop for the report and patch.
-rw-r--r--django/conf/global_settings.py2
-rw-r--r--docs/ref/settings.txt9
-rw-r--r--docs/releases/1.10.txt4
3 files changed, 4 insertions, 11 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index b85d3551b1..cbcf5b4ba0 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -481,8 +481,6 @@ AUTHENTICATION_BACKENDS = ['django.contrib.auth.backends.ModelBackend']
LOGIN_URL = '/accounts/login/'
-LOGOUT_URL = '/accounts/logout/'
-
LOGIN_REDIRECT_URL = '/accounts/profile/'
# The number of days a password reset link is valid for
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 491e8889d4..fc5ef4489e 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -2637,15 +2637,6 @@ This setting also accepts view function names and :ref:`named URL patterns
<naming-url-patterns>` which can be used to reduce configuration duplication
since you don't have to define the URL in two places (``settings`` and URLconf).
-.. setting:: LOGOUT_URL
-
-LOGOUT_URL
-----------
-
-Default: ``'/accounts/logout/'``
-
-LOGIN_URL counterpart.
-
.. setting:: PASSWORD_RESET_TIMEOUT_DAYS
PASSWORD_RESET_TIMEOUT_DAYS
diff --git a/docs/releases/1.10.txt b/docs/releases/1.10.txt
index e86a061f6e..077c9db07c 100644
--- a/docs/releases/1.10.txt
+++ b/docs/releases/1.10.txt
@@ -350,6 +350,10 @@ Miscellaneous
* ``utils.version.get_version()`` returns :pep:`440` compliant release
candidate versions (e.g. '1.10rc1' instead of '1.10c1').
+* The ``LOGOUT_URL`` setting is removed as Django hasn't made use of it
+ since pre-1.0. If you use it in your project, you can add it to your
+ project's settings. The default value was ``'/accounts/login/'``.
+
.. _deprecated-features-1.10:
Features deprecated in 1.10