Merge branch 'release/v18.6.22'

rowers/urls.py

@@ -1,6 +1,6 @@
 from oauth2_provider.views import base
 from django.conf import settings
-from django.conf.urls import url, include
+from django.conf.urls import url, include, handler404, handler500
 from django.urls import path, re_path
 from django.contrib.auth.models import User
 from django.contrib.auth.decorators import login_required, permission_required

rowers/views/errorviews.py

@@ -7,15 +7,17 @@ def servererror_view(request):  # pragma: no cover
 
 
 def error500_view(request):
-    response = render(request, '500.html', {}, status=500)
-    response.status_code = 500
-    return response
+    return render(request,'500.html', status=500)
+    #response = render(request, '500.html', {}, status=500)
+    #response.status_code = 500
+    #return response
 
 
 def error404_view(request, exception):
-    response = render(request, '404.html', {}, status=404)
-    response.status_code = 404
-    return response
+    return render(request,'404.html', status = 404)
+    #response = render(request, '404.html', {}, status=404)
+    #response.status_code = 404
+    #return response
 
 
 def error400_view(request, exception):