mirror of
				https://github.com/cookiecutter/cookiecutter-django.git
				synced 2025-11-04 01:47:28 +03:00 
			
		
		
		
	Merge pull request #828 from pydanny/fix-debug-toolbar-issue-827
Fix django-debug-toolbar issue 827
This commit is contained in:
		
						commit
						cbb132cdec
					
				| 
						 | 
					@ -4,13 +4,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 | 
				
			||||||
 | 
					
 | 
				
			||||||
##[2016-09-29]
 | 
					##[2016-09-29]
 | 
				
			||||||
### Added
 | 
					### Added
 | 
				
			||||||
- Added add default `AUTH_PASSWORD_VALIDATORS` configuration, generated by django 1.10 startproject. See [Password Validation docs](https://docs.djangoproject.com/en/1.10/topics/auth/passwords/#module-django.contrib.auth.password_validation") (@luzfcb)
 | 
					- Added default `AUTH_PASSWORD_VALIDATORS` configuration, generated by django 1.10 startproject. See [Password Validation docs](https://docs.djangoproject.com/en/1.10/topics/auth/passwords/#module-django.contrib.auth.password_validation") (@luzfcb)
 | 
				
			||||||
- Rename `MIDDLEWARE_CLASSES` to `MIDDLEWARE` to enable support to [new style middleware](https://github.com/django/deps/blob/master/final/0005-improved-middleware.rst) introduced in Django 1.10 (@luzfcb)
 | 
					- Rename `MIDDLEWARE_CLASSES` to `MIDDLEWARE` to enable support to [new style middleware](https://github.com/django/deps/blob/master/final/0005-improved-middleware.rst) introduced in Django 1.10 (@luzfcb)
 | 
				
			||||||
- New setting `MAILGUN_SENDER_DOMAIN` to allow sending mail from any domain other than those registered with mailgun (@jangeador)
 | 
					- New setting `MAILGUN_SENDER_DOMAIN` to allow sending mail from any domain other than those registered with mailgun (@jangeador)
 | 
				
			||||||
 | 
					- add `urlpatterns` configuration to django-debug-toolbar, because the automatic configuration of `urlpatterns` was removed from django-debug-toolbar (@luzfcb)
 | 
				
			||||||
 | 
					- Added Temporary workaround on `requirements/local.txt` to fix django-debug-toolbar issue: https://github.com/pydanny/cookiecutter-django/issues/827 (@luzfcb)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
### Changed
 | 
					### Changed
 | 
				
			||||||
- Upgrade to Django 1.10.1 (@luzfcb)
 | 
					- Upgrade to Django 1.10.1 (@luzfcb)
 | 
				
			||||||
- Upgrade django-model-utils to 2.6, django-redis to 4.5.0, redis to 2.10.5, Sphinx to 1.4.6, pytest-django to 3.0.0, django-anymail to 0.5, raven to 5.27.1 (@luzfcb)
 | 
					- Upgrade django-model-utils to 2.6, django-redis to 4.5.0, redis to 2.10.5, Sphinx to 1.4.6, pytest-django to 3.0.0, django-anymail to 0.5, raven to 5.27.1, whitenoise to 3.2.2 (@luzfcb)
 | 
				
			||||||
- Upgrade to Bootstrap 4 Alpha 4, jQuery to 3.1.1, tether.js to 1.3.7 (@luzfcb)
 | 
					- Upgrade to Bootstrap 4 Alpha 4, jQuery to 3.1.1, tether.js to 1.3.7 (@luzfcb)
 | 
				
			||||||
- Update `manage.py` to use same code of `manage.py` from Django 1.10 (@luzfcb)
 | 
					- Update `manage.py` to use same code of `manage.py` from Django 1.10 (@luzfcb)
 | 
				
			||||||
- Sync `sites` app migrations with django 1.10, and fix aditional migrations to `sites` and `user` app (@luzfcb)
 | 
					- Sync `sites` app migrations with django 1.10, and fix aditional migrations to `sites` and `user` app (@luzfcb)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -33,3 +33,9 @@ if settings.DEBUG:
 | 
				
			||||||
        url(r'^404/$', default_views.page_not_found, kwargs={'exception': Exception('Page not Found')}),
 | 
					        url(r'^404/$', default_views.page_not_found, kwargs={'exception': Exception('Page not Found')}),
 | 
				
			||||||
        url(r'^500/$', default_views.server_error),
 | 
					        url(r'^500/$', default_views.server_error),
 | 
				
			||||||
    ]
 | 
					    ]
 | 
				
			||||||
 | 
					    if 'debug_toolbar' in settings.INSTALLED_APPS:
 | 
				
			||||||
 | 
					        import debug_toolbar
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        urlpatterns += [
 | 
				
			||||||
 | 
					            url(r'^__debug__/', include(debug_toolbar.urls)),
 | 
				
			||||||
 | 
					        ]
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -7,7 +7,11 @@ django-extensions==1.7.4
 | 
				
			||||||
Werkzeug==0.11.11
 | 
					Werkzeug==0.11.11
 | 
				
			||||||
django-test-plus==1.0.15
 | 
					django-test-plus==1.0.15
 | 
				
			||||||
factory_boy==2.7.0
 | 
					factory_boy==2.7.0
 | 
				
			||||||
django-debug-toolbar==1.5
 | 
					
 | 
				
			||||||
 | 
					# Temporary workaround to fix issue https://github.com/pydanny/cookiecutter-django/issues/827
 | 
				
			||||||
 | 
					# It will be removed when django-debug-toolbar publish the new version on pypi
 | 
				
			||||||
 | 
					-e git+https://github.com/jazzband/django-debug-toolbar.git@637b0b73bc684f6ea600dca5ca1bb1f090fcee93#egg=django-debug-toolbar
 | 
				
			||||||
 | 
					#django-debug-toolbar==1.5
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# improved REPL
 | 
					# improved REPL
 | 
				
			||||||
ipdb==0.10.1
 | 
					ipdb==0.10.1
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user