Branch: refs/heads/release_18.01 Home: https://github.com/galaxyproject/galaxy Commit: 244273ad554df1ab3bf337016a35b3fbe565c3fe https://github.com/galaxyproject/galaxy/commit/244273ad554df1ab3bf337016a35b... Author: John Chilton <jmchilton@gmail.com> Date: 2018-03-23 (Fri, 23 Mar 2018) Changed paths: M lib/galaxy/webapps/galaxy/api/configuration.py Log Message: ----------- [18.01] Fix /api/whoami for master API key. Just yield a null JSON response instead of the internal server error that happens currently. Commit: 198268a0aa9d62b0c3ca45f58734cc8fb5085875 https://github.com/galaxyproject/galaxy/commit/198268a0aa9d62b0c3ca45f58734c... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-03-23 (Fri, 23 Mar 2018) Changed paths: M lib/galaxy/webapps/galaxy/api/configuration.py Log Message: ----------- Merge pull request #5773 from jmchilton/fix_whoami_1801 [18.01] Fix /api/whoami for master API key. Compare: https://github.com/galaxyproject/galaxy/compare/66e624f90b31...198268a0aa9d