diff --git a/django/contrib/admin/static/admin/css/forms.css b/django/contrib/admin/static/admin/css/forms.css index 76e2d493e9dd..6d13d433500e 100644 --- a/django/contrib/admin/static/admin/css/forms.css +++ b/django/contrib/admin/static/admin/css/forms.css @@ -102,7 +102,7 @@ fieldset .inline-heading, } .aligned legend { - float: left; + float: inline-start; } .aligned legend, @@ -148,15 +148,11 @@ form .aligned ul { } form .aligned div.radiolist { - display: inline-block; + display: block; margin: 0; padding: 0; } -form .aligned fieldset div.help { - margin-left: 0; -} - form .aligned p.help, form .aligned div.help { margin-top: 0; diff --git a/django/contrib/admin/static/admin/css/responsive.css b/django/contrib/admin/static/admin/css/responsive.css index fbf0d88b4028..93abf79953c3 100644 --- a/django/contrib/admin/static/admin/css/responsive.css +++ b/django/contrib/admin/static/admin/css/responsive.css @@ -560,6 +560,10 @@ input[type="submit"], button { margin-top: 5px; } + form .aligned fieldset div.flex-container { + display: unset; + } + /* Related widget */ .related-widget-wrapper { diff --git a/django/contrib/admin/templates/admin/auth/user/change_password.html b/django/contrib/admin/templates/admin/auth/user/change_password.html index 08d191b765e4..d3e546d28d89 100644 --- a/django/contrib/admin/templates/admin/auth/user/change_password.html +++ b/django/contrib/admin/templates/admin/auth/user/change_password.html @@ -40,7 +40,7 @@
{{ form.usable_password.errors }} -
{{ form.usable_password.legend_tag }} {{ form.usable_password }}
+
{{ form.usable_password.legend_tag }} {{ form.usable_password }}
{% if form.usable_password.help_text %}

{{ form.usable_password.help_text|safe }}

diff --git a/django/contrib/admin/templates/admin/includes/fieldset.html b/django/contrib/admin/templates/admin/includes/fieldset.html index aa8d94b41d30..1fd303ea823e 100644 --- a/django/contrib/admin/templates/admin/includes/fieldset.html +++ b/django/contrib/admin/templates/admin/includes/fieldset.html @@ -11,7 +11,7 @@
{% if line.fields|length == 1 %}{{ line.errors }}{% else %}
{% endif %} {% for field in line %} - {% if field.is_fieldset %}
{{ field.label_tag }}{% endif %} + {% if field.is_fieldset %}{{ field.label_tag }}{% endif %}
{% if not line.fields|length == 1 and not field.is_readonly %}{{ field.errors }}{% endif %}
diff --git a/django/db/backends/sqlite3/features.py b/django/db/backends/sqlite3/features.py index 668a53928dd6..ed24341b5e6c 100644 --- a/django/db/backends/sqlite3/features.py +++ b/django/db/backends/sqlite3/features.py @@ -157,6 +157,7 @@ def max_query_params(self): 32766) or lowered per connection at run-time with setlimit(SQLITE_LIMIT_VARIABLE_NUMBER, N). """ + self.connection.ensure_connection() return self.connection.connection.getlimit(sqlite3.SQLITE_LIMIT_VARIABLE_NUMBER) @cached_property diff --git a/docs/intro/tutorial02.txt b/docs/intro/tutorial02.txt index 23bf6c4c94dc..8f99965a47e8 100644 --- a/docs/intro/tutorial02.txt +++ b/docs/intro/tutorial02.txt @@ -308,7 +308,6 @@ database: Operations to perform: Apply all migrations: admin, auth, contenttypes, polls, sessions Running migrations: - Rendering model states... DONE Applying polls.0001_initial... OK The :djadmin:`migrate` command takes all the migrations that haven't been diff --git a/docs/releases/6.0.1.txt b/docs/releases/6.0.1.txt index 36e533a88871..790fa76e997e 100644 --- a/docs/releases/6.0.1.txt +++ b/docs/releases/6.0.1.txt @@ -20,3 +20,10 @@ Bugfixes * Fixed a bug where management command colorized help (introduced in Python 3.14) ignored the :option:`--no-color` option and the :envvar:`DJANGO_COLORS` setting (:ticket:`36376`). + +* Fixed a regression in Django 6.0 that caused + :meth:`~django.db.models.query.QuerySet.bulk_create` to crash + when introspecting the connection on SQLite (:ticket:`36818`). + +* Fixed a visual regression in Django 6.0 for admin form fields grouped under a + ``
`` in Safari (:ticket:`36807`). diff --git a/docs/topics/migrations.txt b/docs/topics/migrations.txt index 90034b0dfeed..f68f512cdd35 100644 --- a/docs/topics/migrations.txt +++ b/docs/topics/migrations.txt @@ -135,7 +135,6 @@ database to make sure they work as expected: Operations to perform: Apply all migrations: books Running migrations: - Rendering model states... DONE Applying books.0003_auto... OK Once the migration is applied, commit the migration and the models change diff --git a/tests/auth_tests/test_views.py b/tests/auth_tests/test_views.py index a3863b6233c0..d7d59d9fc033 100644 --- a/tests/auth_tests/test_views.py +++ b/tests/auth_tests/test_views.py @@ -1555,8 +1555,7 @@ def test_user_with_usable_password_change_password(self): # Usable password field. self.assertContains( response, - '
' - "Password-based authentication:", + "
Password-based authentication:", ) # Submit buttons self.assertContains(response, '