[pull] master from cookiecutter:master

.github/contributors.json

@@ -1528,5 +1528,15 @@
     "name": "Mounir",
     "github_login": "mounirmesselmeni",
     "twitter_username": ""
+  },
+  {
+    "name": "JAEGYUN JUNG",
+    "github_login": "TGoddessana",
+    "twitter_username": ""
+  },
+  {
+    "name": "Simeon Emanuilov",
+    "github_login": "s-emanuilov",
+    "twitter_username": "s_emanuilov"
   }
 ]

CHANGELOG.md

@@ -3,6 +3,25 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2024.02.28
+
+
+### Fixed
+
+- Fix invalid HTML in django-allauth field element template ([#4894](https://github.com/cookiecutter/cookiecutter-django/pull/4894))
+
+- Fix permissions for media files when served by nginx ([#4889](https://github.com/cookiecutter/cookiecutter-django/pull/4889))
+
+### Documentation
+
+- Fix broken &#34;Two scoops of django&#34; link in FAQ ([#4892](https://github.com/cookiecutter/cookiecutter-django/pull/4892))
+
+### Updated
+
+- Update redis to 5.0.2 ([#4895](https://github.com/cookiecutter/cookiecutter-django/pull/4895))
+
+- Update sentry-sdk to 1.40.6 ([#4893](https://github.com/cookiecutter/cookiecutter-django/pull/4893))
+
 ## 2024.02.26
 
 

CONTRIBUTORS.md

@@ -1048,6 +1048,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>JAEGYUN JUNG</td>
+    <td>
+      <a href="https://github.com/TGoddessana">TGoddessana</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Jakub Boukal</td>
     <td>
@@ -1839,6 +1846,13 @@ Listed in alphabetical order.
     </td>
     <td>shywn_mrk</td>
   </tr>
+  <tr>
+    <td>Simeon Emanuilov</td>
+    <td>
+      <a href="https://github.com/s-emanuilov">s-emanuilov</a>
+    </td>
+    <td>s_emanuilov</td>
+  </tr>
   <tr>
     <td>Simon Rey</td>
     <td>

docs/faq.rst

@@ -22,6 +22,6 @@ TODO
 Why doesn't this follow the layout from Two Scoops of Django?
 -------------------------------------------------------------
 
-You may notice that some elements of this project do not exactly match what we describe in chapter 3 of `Two Scoops of Django 1.11`_. The reason for that is this project, amongst other things, serves as a test bed for trying out new ideas and concepts. Sometimes they work, sometimes they don't, but the end result is that it won't necessarily match precisely what is described in the book I co-authored.
+You may notice that some elements of this project do not exactly match what we describe in chapter 3 of `Two Scoops of Django 3.x`_. The reason for that is this project, amongst other things, serves as a test bed for trying out new ideas and concepts. Sometimes they work, sometimes they don't, but the end result is that it won't necessarily match precisely what is described in the book I co-authored.
 
-.. _Two Scoops of Django 1.11: https://www.feldroy.com/collections/django/products/two-scoops-of-django-1-11
+.. _Two Scoops of Django 3.x: https://www.feldroy.com/books/two-scoops-of-django-3-x

setup.py

@@ -5,7 +5,7 @@
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2024.02.26"
+version = "2024.02.28"
 
 with open("README.md") as readme_file:
     long_description = readme_file.read()

{{cookiecutter.project_slug}}/compose/production/django/Dockerfile

@@ -117,7 +117,7 @@ COPY --chown=django:django . ${APP_HOME}
 {%- endif %}
 
 # make django owner of the WORKDIR directory as well.
-RUN chown django:django ${APP_HOME}
+RUN chown -R django:django ${APP_HOME}
 
 USER django
 

{{cookiecutter.project_slug}}/requirements/base.txt

@@ -11,7 +11,7 @@ argon2-cffi==23.1.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==6.6.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==5.0.1  # https://github.com/redis/redis-py
+redis==5.0.2  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.3.2  # https://github.com/redis/hiredis-py
 {%- endif %}

{{cookiecutter.project_slug}}/requirements/production.txt

@@ -8,7 +8,7 @@ psycopg[c]==3.1.18  # https://github.com/psycopg/psycopg
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.40.5  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.40.6  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
 hiredis==2.3.2  # https://github.com/redis/hiredis-py

{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/field.html

@@ -33,7 +33,7 @@
              {% if attrs.autocomplete %}autocomplete="{{ attrs.autocomplete }}"{% endif %}
              value="{{ attrs.value|default_if_none:"" }}"
              type="{{ attrs.type }}" />
-      <label class="form-check-label" for="gridRadios1">
+      <label class="form-check-label" for="{{ attrs.id }}">
         {% slot label %}
       {% endslot %}
     </label>
@@ -62,6 +62,5 @@
 </div>
 {% endif %}
 {% if slots.help_text %}
-  <div class="form-text">{% slot help_text %}</div>
-{% endslot %}
+  <div class="form-text">{% slot help_text %}{% endslot %}</div>
 {% endif %}{% endraw %}