Branch: refs/heads/release_18.01 Home: https://github.com/galaxyproject/galaxy Commit: fe444ab3ef6bf37761859e09a0baf3ec38e7c6c4 https://github.com/galaxyproject/galaxy/commit/fe444ab3ef6bf37761859e09a0baf... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-03-08 (Thu, 08 Mar 2018) Changed paths: M lib/galaxy/webapps/galaxy/controllers/history.py Log Message: ----------- Show error message if history structure can't be shown Fixes: ``` AttributeError: 'NoneType' object has no attribute 'id' File "galaxy/web/framework/middleware/sentry.py", line 43, in __call__ iterable = self.application(environ, start_response) File "/cvmfs/main.galaxyproject.org/venv/lib/python2.7/site-packages/paste/recursive.py", line 85, in __call__ return self.application(environ, start_response) File "galaxy/web/framework/middleware/statsd.py", line 35, in __call__ req = self.application(environ, start_response) File "/cvmfs/main.galaxyproject.org/venv/lib/python2.7/site-packages/paste/httpexceptions.py", line 640, in __call__ return self.application(environ, start_response) File "galaxy/web/framework/base.py", line 136, in __call__ return self.handle_request(environ, start_response) File "galaxy/web/framework/base.py", line 215, in handle_request body = method(trans, **kwargs) File "galaxy/webapps/galaxy/controllers/history.py", line 494, in display_structured assert (history.user and (history.user.id == trans.user.id) or ``` Commit: a0fd6307562b38a7ef93291c6450cb92bd0eaf59 https://github.com/galaxyproject/galaxy/commit/a0fd6307562b38a7ef93291c6450c... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-03-08 (Thu, 08 Mar 2018) Changed paths: M lib/galaxy/webapps/galaxy/controllers/history.py Log Message: ----------- Merge pull request #5665 from mvdbeek/show_error_msg_when_history_structure_cannot_be_shown [18.01] Show error message if history structure can't be shown Compare: https://github.com/galaxyproject/galaxy/compare/0a95f20f5ba7...a0fd6307562b