mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2025-08-07 13:34:53 +03:00
Merge branch 'master' into update/pre-commit-autoupdate
This commit is contained in:
commit
0393af2580
5
.github/contributors.json
vendored
5
.github/contributors.json
vendored
|
@ -1633,5 +1633,10 @@
|
||||||
"name": "rxm7706",
|
"name": "rxm7706",
|
||||||
"github_login": "rxm7706",
|
"github_login": "rxm7706",
|
||||||
"twitter_username": ""
|
"twitter_username": ""
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Marlon Castillo",
|
||||||
|
"github_login": "mcastle",
|
||||||
|
"twitter_username": ""
|
||||||
}
|
}
|
||||||
]
|
]
|
|
@ -1468,6 +1468,13 @@ Listed in alphabetical order.
|
||||||
</td>
|
</td>
|
||||||
<td></td>
|
<td></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>Marlon Castillo</td>
|
||||||
|
<td>
|
||||||
|
<a href="https://github.com/mcastle">mcastle</a>
|
||||||
|
</td>
|
||||||
|
<td></td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Martin Blech</td>
|
<td>Martin Blech</td>
|
||||||
<td>
|
<td>
|
||||||
|
|
|
@ -78,12 +78,6 @@ SECURE_CONTENT_TYPE_NOSNIFF = env.bool(
|
||||||
default=True,
|
default=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
{% if cookiecutter.cloud_provider != 'None' -%}
|
|
||||||
# STORAGES
|
|
||||||
# ------------------------------------------------------------------------------
|
|
||||||
# https://django-storages.readthedocs.io/en/latest/#installation
|
|
||||||
INSTALLED_APPS += ["storages"]
|
|
||||||
{%- endif -%}
|
|
||||||
{% if cookiecutter.cloud_provider == 'AWS' %}
|
{% if cookiecutter.cloud_provider == 'AWS' %}
|
||||||
# https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
|
# https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
|
||||||
AWS_ACCESS_KEY_ID = env("DJANGO_AWS_ACCESS_KEY_ID")
|
AWS_ACCESS_KEY_ID = env("DJANGO_AWS_ACCESS_KEY_ID")
|
||||||
|
|
Loading…
Reference in New Issue
Block a user