merge with upstream

tracim/__init__.py

@@ -59,11 +59,13 @@ def web(global_config, **local_settings):
     # set Hapic
     context = PyramidContext(
         configurator=configurator,
-        default_error_builder=ErrorSchema()
+        default_error_builder=ErrorSchema(),
+        debug=app_config.DEBUG,
     )
     hapic.set_context(context)
     context.handle_exception(NotFound, 404)
     context.handle_exception(OperationalError, 500)
+    context.handle_exception(Exception, 500)
     # Add controllers
     session_controller = SessionController()
     system_controller = SystemController()

tracim/config.py

@@ -130,6 +130,7 @@ class CFG(object):
             '604800',
         ))
 
+        self.DEBUG = asbool(settings.get('debug', False))
         # TODO - G.M - 27-03-2018 - [Email] Restore email config
         ###
         # EMAIL related stuff (notification, reply)