Commit Graph

5490 Commits

Author SHA1 Message Date
Bruno Alla
adfa02e5c0
Merge pull request #3121 from pydanny/fix/dockerignore
Switch .dockerignore to explicit list
2021-04-08 20:05:06 +01:00
Bruno Alla
49b739fc9e Switch .dockerignore to explicit list
Use explicit list of files to ignore instead of exceptions.

Fix #713
2021-04-08 19:42:24 +01:00
Bruno Alla
7756ce56d4
Merge pull request #3038 from arnav13081994/update_tests_deprecation 2021-04-08 18:58:09 +01:00
Bruno Alla
47f5b40ace Update Heroku to latest 3.9.x 2021-04-08 18:53:14 +01:00
Bruno Alla
ea84b6ccab Merge branch 'master' into update_tests_deprecation
# Conflicts:
#	{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
2021-04-08 18:47:47 +01:00
Bruno Alla
9e7320ea1b Merge branch 'master' into fix_upgrade_py39
# Conflicts:
#	README.rst
#	{{cookiecutter.project_slug}}/.gitlab-ci.yml
#	{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
#	{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
2021-04-08 18:43:54 +01:00
Bruno Alla
69f43da185
Merge pull request #2815 from arnav13081994/django-multi 2021-04-08 18:40:48 +01:00
Bruno Alla
7cd62c1291
Merge pull request #3120 from pydanny/pyup-update-pre-commit-2.10.1-to-2.12.0
Update pre-commit to 2.12.0
2021-04-08 14:45:06 +01:00
browniebroke
c08f6115b0 Update Changelog 2021-04-08 02:26:56 +00:00
Bruno Alla
e6604f9a7d Fix style 2021-04-07 21:12:36 +01:00
Bruno Alla
5a393f1d34 Merge branch 'master' into django-multi 2021-04-07 21:06:45 +01:00
pyup-bot
9c4f047886 Update pre-commit from 2.10.1 to 2.12.0 2021-04-07 13:01:52 -07:00
Bruno Alla
c09830d335
Merge pull request #3077 from pydanny/fix/linting-gh-actions 2021-04-07 21:01:47 +01:00
Bruno Alla
675cef0a95 Fix linting issues in template 2021-04-07 20:57:04 +01:00
Bruno Alla
382dce2803 Fix linting issues in Gulpfile 2021-04-07 20:57:04 +01:00
Bruno Alla
e08b17a234 Run pre-commit for linting in Docker 2021-04-07 20:57:04 +01:00
Bruno Alla
c7bb4834e0 Fix pre-commit hook issues with Docker & Celery 2021-04-07 20:57:04 +01:00
Bruno Alla
c382894934 Fix pre-commit hook issues 2021-04-07 20:57:04 +01:00
Bruno Alla
095a2a56af Run linting via pre-commit on CI 2021-04-07 20:57:04 +01:00
browniebroke
3f3148f88f Update Contributors 2021-04-07 19:50:12 +00:00
Bruno Alla
c6d7739d7a
Merge pull request #3112 from Tamerz/fix-gitlab-ci 2021-04-07 20:49:40 +01:00
Bruno Alla
fa143aa60a Bump version to 3.1.8 2021-04-07 20:47:03 +01:00
pyup-bot
83423025d9 Update hiredis from 1.1.0 to 2.0.0 2021-04-07 20:44:37 +01:00
pyup-bot
329493903a Update hiredis from 1.1.0 to 2.0.0 2021-04-07 20:44:37 +01:00
Bruno Alla
83db915dce
Merge pull request #3080 from pydanny/pyup-update-sentry-sdk-0.20.3-to-1.0.0
Update sentry-sdk to 1.0.0
2021-04-07 20:41:06 +01:00
pyup-bot
3a23b5f45e Update sentry-sdk from 0.20.3 to 1.0.0 2021-04-07 20:28:35 +01:00
Bruno Alla
bfe1d22c1e
Merge pull request #3108 from pydanny/pyup-update-gunicorn-20.0.4-to-20.1.0
Update gunicorn to 20.1.0
2021-04-07 20:26:05 +01:00
Bruno Alla
1379fc08e2
Merge pull request #3118 from pydanny/pyup-update-pre-commit-2.11.1-to-2.12.0
Update pre-commit to 2.12.0
2021-04-07 20:25:23 +01:00
Bruno Alla
2e7a7d68ce
Merge pull request #3116 from pydanny/pyup-update-django-extensions-3.1.1-to-3.1.2
Update django-extensions to 3.1.2
2021-04-07 20:24:58 +01:00
Bruno Alla
1039b310e8
Merge pull request #3113 from pydanny/pyup-update-pillow-8.1.2-to-8.2.0
Update pillow to 8.2.0
2021-04-07 20:24:39 +01:00
Bruno Alla
71f75cf558
Merge pull request #3117 from pydanny/pyup-update-django-3.1.7-to-3.1.8
Update django to 3.1.8
2021-04-07 20:24:17 +01:00
Bruno Alla
7423bb91d6
Merge pull request #3115 from pydanny/pyup-update-pytest-6.2.2-to-6.2.3
Update pytest to 6.2.3
2021-04-07 20:23:57 +01:00
pyup-bot
a567c85fb5 Update pre-commit from 2.11.1 to 2.12.0 2021-04-06 21:03:28 -07:00
pyup-bot
289a14aef1 Update django from 3.1.7 to 3.1.8 2021-04-06 17:56:14 -07:00
pyup-bot
a5727efc55 Update django-extensions from 3.1.1 to 3.1.2 2021-04-05 08:36:26 -07:00
pyup-bot
9e62ff99d5 Update pytest from 6.2.2 to 6.2.3 2021-04-04 12:36:50 -07:00
pyup-bot
0ef98a118b Update pillow from 8.1.2 to 8.2.0 2021-04-02 11:19:19 -07:00
Tames McTigue
49bf68aa00 Fixed blank space 2021-03-30 13:26:12 +03:00
Tames McTigue
5314faaf8a Fixed placement of image key value for non-Docker run. 2021-03-30 13:09:29 +03:00
pyup-bot
0073683c70 Update gunicorn from 20.0.4 to 20.1.0 2021-03-27 02:04:38 -07:00
browniebroke
a18ccd3523 Update Changelog 2021-03-27 02:23:07 +00:00
Bruno Alla
39997f3203
Merge pull request #3107 from pydanny/pyup-update-djangorestframework-3.12.3-to-3.12.4
Update djangorestframework to 3.12.4
2021-03-26 17:59:09 +00:00
pyup-bot
140c3a961c Update djangorestframework from 3.12.3 to 3.12.4 2021-03-26 09:30:46 -07:00
browniebroke
ebc2f0446a Update Changelog 2021-03-26 02:15:58 +00:00
Bruno Alla
9872908c00
Merge pull request #3105 from pydanny/pyup-update-djangorestframework-3.12.2-to-3.12.3
Update djangorestframework to 3.12.3
2021-03-25 20:08:31 +00:00
pyup-bot
a7847ec2cc Update djangorestframework from 3.12.2 to 3.12.3 2021-03-25 09:30:30 -07:00
browniebroke
b6bd76d428 Update Changelog 2021-03-23 02:37:18 +00:00
Bruno Alla
ed8d60f1cf
Merge pull request #3104 from pydanny/pyup-update-django-crispy-forms-1.11.1-to-1.11.2
Update django-crispy-forms to 1.11.2
2021-03-22 22:29:40 +00:00
pyup-bot
b07c5d5d90 Update django-crispy-forms from 1.11.1 to 1.11.2 2021-03-22 07:21:59 -07:00
Bruno Alla
be4b21f340
Merge pull request #3103 from pydanny/pyup-update-sphinx-3.5.1-to-3.5.3
Update sphinx to 3.5.3
2021-03-22 11:35:03 +00:00