summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Holtermann <info@markusholtermann.eu>2021-01-29 15:14:21 +0100
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2021-02-06 13:34:00 +0100
commit9d05add447d57d94ec9e9b3daa338d85a29fe083 (patch)
tree7bfc34ee70b2e7402b71f5a4186aade95f874a34
parent63d239db037f02d98b7771c90422840bbb4a319a (diff)
Fixed #32394 -- Changed project template settings to use relative STATIC_URL.
Refs #25598 which added original support for relative STATIC_URL and MEDIA_URL.
-rw-r--r--django/conf/project_template/project_name/settings.py-tpl2
-rw-r--r--docs/releases/4.0.txt4
2 files changed, 5 insertions, 1 deletions
diff --git a/django/conf/project_template/project_name/settings.py-tpl b/django/conf/project_template/project_name/settings.py-tpl
index 7830fb2f3c..e949752df4 100644
--- a/django/conf/project_template/project_name/settings.py-tpl
+++ b/django/conf/project_template/project_name/settings.py-tpl
@@ -117,7 +117,7 @@ USE_TZ = True
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/{{ docs_version }}/howto/static-files/
-STATIC_URL = '/static/'
+STATIC_URL = 'static/'
# Default primary key field type
# https://docs.djangoproject.com/en/{{ docs_version }}/ref/settings/#default-auto-field
diff --git a/docs/releases/4.0.txt b/docs/releases/4.0.txt
index 94782e891f..37783b906b 100644
--- a/docs/releases/4.0.txt
+++ b/docs/releases/4.0.txt
@@ -258,6 +258,10 @@ Miscellaneous
* Support for ``cx_Oracle`` < 7.0 is removed.
+* Starting with 4.0, new projects are generated with :setting:`STATIC_URL` set
+ to the relative path ``'static/'``. This allows for the ``SCRIPT_NAME`` to be
+ prepended as necessary.
+
.. _deprecated-features-4.0:
Features deprecated in 4.0