diff --git a/lib/galaxy/config/sample/datatypes_conf.xml.sample b/lib/galaxy/config/sample/datatypes_conf.xml.sample index bbaef985a1b..09f6a19f341 100644 --- a/lib/galaxy/config/sample/datatypes_conf.xml.sample +++ b/lib/galaxy/config/sample/datatypes_conf.xml.sample @@ -398,7 +398,11 @@ - + + + + + diff --git a/lib/galaxy/web/framework/webapp.py b/lib/galaxy/web/framework/webapp.py index 85500107426..6447ea08bd6 100644 --- a/lib/galaxy/web/framework/webapp.py +++ b/lib/galaxy/web/framework/webapp.py @@ -251,7 +251,7 @@ class GalaxyWebTransaction(base.DefaultWebTransaction, self.user = None self.galaxy_session = None else: - self.response.send_redirect(url_for(controller='user', + self.response.send_redirect(url_for(controller='root', action='login', message="You have been logged out due to inactivity. Please log in again to continue using Galaxy.", status='info',