Branch: refs/heads/release_18.01 Home: https://github.com/galaxyproject/galaxy Commit: 706efdc186177c36871aa47059de64aa0112f1a0 https://github.com/galaxyproject/galaxy/commit/706efdc186177c36871aa47059de6... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-03-08 (Thu, 08 Mar 2018) Changed paths: M lib/galaxy/webapps/galaxy/controllers/user.py Log Message: ----------- Fix exception if email is not specified We render a regular error a few lines lower. Commit: 17e1786521e458819f2cdb9821fd3e96c18bc3a7 https://github.com/galaxyproject/galaxy/commit/17e1786521e458819f2cdb9821fd3... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-03-08 (Thu, 08 Mar 2018) Changed paths: M lib/galaxy/webapps/galaxy/controllers/user.py Log Message: ----------- Avoid exception if email is wrong Avoids: ``` AttributeError: 'NoneType' object has no attribute 'active' 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/user.py", line 938, in activate if user.active is True: ``` Commit: 0a95f20f5ba7e41282a29afb21a41290033cfed8 https://github.com/galaxyproject/galaxy/commit/0a95f20f5ba7e41282a29afb21a41... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-03-08 (Thu, 08 Mar 2018) Changed paths: M lib/galaxy/webapps/galaxy/controllers/user.py Log Message: ----------- Merge pull request #5663 from mvdbeek/user_activation_fix [18.01] Fix exception if email is not specified or email is wrong Compare: https://github.com/galaxyproject/galaxy/compare/3ce1273d7cc4...0a95f20f5ba7