Merge branch 'release/v18.6.21'
This commit is contained in:
@@ -244,6 +244,7 @@ urlpatterns = [
|
|||||||
re_path(r'^api/v2/workouts/(?P<id>\b[0-9A-Fa-f]+\b)/strokedata/$', views.strokedatajson_v2,
|
re_path(r'^api/v2/workouts/(?P<id>\b[0-9A-Fa-f]+\b)/strokedata/$', views.strokedatajson_v2,
|
||||||
name='strokedatajson_v2'),
|
name='strokedatajson_v2'),
|
||||||
re_path(r'^500v/$', views.error500_view, name='error500_view'),
|
re_path(r'^500v/$', views.error500_view, name='error500_view'),
|
||||||
|
re_path(r'^500q/$', views.servererror_view, name='servererror_view'),
|
||||||
path('502/', TemplateView.as_view(template_name='502.html'), name='502'),
|
path('502/', TemplateView.as_view(template_name='502.html'), name='502'),
|
||||||
path('500/', TemplateView.as_view(template_name='500.html'), name='500'),
|
path('500/', TemplateView.as_view(template_name='500.html'), name='500'),
|
||||||
path('404/', TemplateView.as_view(template_name='404.html'), name='404'),
|
path('404/', TemplateView.as_view(template_name='404.html'), name='404'),
|
||||||
|
|||||||
@@ -385,7 +385,7 @@ SESSION_EXPIRE_AT_BROWSER_CLOSE = True
|
|||||||
|
|
||||||
# admin stuff for error reporting
|
# admin stuff for error reporting
|
||||||
SERVER_EMAIL = 'admin@rowsandall.com'
|
SERVER_EMAIL = 'admin@rowsandall.com'
|
||||||
ADMINS = [('Sander', 'roosendaalsander@gmail.com')]
|
ADMINS = [('Sander', 'roosendaalsander@gmail.com'),]
|
||||||
|
|
||||||
CACHES = {
|
CACHES = {
|
||||||
'default': {
|
'default': {
|
||||||
|
|||||||
Reference in New Issue
Block a user