mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2025-08-11 15:34:51 +03:00
Merge branch 'cookiecutter:master' into master
This commit is contained in:
commit
b2f56febda
5
.github/contributors.json
vendored
5
.github/contributors.json
vendored
|
@ -1418,5 +1418,10 @@
|
||||||
"name": "villancikos",
|
"name": "villancikos",
|
||||||
"github_login": "villancikos",
|
"github_login": "villancikos",
|
||||||
"twitter_username": ""
|
"twitter_username": ""
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Imran Rahman",
|
||||||
|
"github_login": "infraredCoding",
|
||||||
|
"twitter_username": ""
|
||||||
}
|
}
|
||||||
]
|
]
|
15
CHANGELOG.md
15
CHANGELOG.md
|
@ -3,6 +3,21 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
|
||||||
|
|
||||||
<!-- GENERATOR_PLACEHOLDER -->
|
<!-- GENERATOR_PLACEHOLDER -->
|
||||||
|
|
||||||
|
## 2023.07.24
|
||||||
|
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Add missing custom CRSF error page in prod ([#4464](https://github.com/cookiecutter/cookiecutter-django/pull/4464))
|
||||||
|
|
||||||
|
### Documentation
|
||||||
|
|
||||||
|
- Replace `docker-compose` by `docker compose` in docs ([#4463](https://github.com/cookiecutter/cookiecutter-django/pull/4463))
|
||||||
|
|
||||||
|
### Updated
|
||||||
|
|
||||||
|
- Update drf-spectacular to 0.26.4 ([#4481](https://github.com/cookiecutter/cookiecutter-django/pull/4481))
|
||||||
|
|
||||||
## 2023.07.20
|
## 2023.07.20
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -957,6 +957,13 @@ Listed in alphabetical order.
|
||||||
</td>
|
</td>
|
||||||
<td></td>
|
<td></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>Imran Rahman</td>
|
||||||
|
<td>
|
||||||
|
<a href="https://github.com/infraredCoding">infraredCoding</a>
|
||||||
|
</td>
|
||||||
|
<td></td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>innicoder</td>
|
<td>innicoder</td>
|
||||||
<td>
|
<td>
|
||||||
|
|
2
setup.py
2
setup.py
|
@ -5,7 +5,7 @@ except ImportError:
|
||||||
from distutils.core import setup
|
from distutils.core import setup
|
||||||
|
|
||||||
# We use calendar versioning
|
# We use calendar versioning
|
||||||
version = "2023.07.20"
|
version = "2023.07.24"
|
||||||
|
|
||||||
with open("README.rst") as readme_file:
|
with open("README.rst") as readme_file:
|
||||||
long_description = readme_file.read()
|
long_description = readme_file.read()
|
||||||
|
|
|
@ -43,7 +43,7 @@ django-redis==5.3.0 # https://github.com/jazzband/django-redis
|
||||||
djangorestframework==3.14.0 # https://github.com/encode/django-rest-framework
|
djangorestframework==3.14.0 # https://github.com/encode/django-rest-framework
|
||||||
django-cors-headers==4.2.0 # https://github.com/adamchainz/django-cors-headers
|
django-cors-headers==4.2.0 # https://github.com/adamchainz/django-cors-headers
|
||||||
# DRF-spectacular for api documentation
|
# DRF-spectacular for api documentation
|
||||||
drf-spectacular==0.26.3 # https://github.com/tfranzel/drf-spectacular
|
drf-spectacular==0.26.4 # https://github.com/tfranzel/drf-spectacular
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
{%- if cookiecutter.frontend_pipeline == 'Webpack' %}
|
{%- if cookiecutter.frontend_pipeline == 'Webpack' %}
|
||||||
django-webpack-loader==2.0.1 # https://github.com/django-webpack/django-webpack-loader
|
django-webpack-loader==2.0.1 # https://github.com/django-webpack/django-webpack-loader
|
||||||
|
|
|
@ -0,0 +1,14 @@
|
||||||
|
{% raw %}{% extends "base.html" %}
|
||||||
|
|
||||||
|
{% block title %}Forbidden (403){% endblock title %}
|
||||||
|
{% block content %}
|
||||||
|
<h1>Forbidden (403)</h1>
|
||||||
|
<p>
|
||||||
|
{% if exception %}
|
||||||
|
{{ exception }}
|
||||||
|
{% else %}
|
||||||
|
You're not allowed to access this page.
|
||||||
|
{% endif %}
|
||||||
|
</p>
|
||||||
|
{% endblock content %}
|
||||||
|
{%- endraw %}
|
Loading…
Reference in New Issue
Block a user