Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: b0d094481a81d4efed4ca3916da6e4540b43b7d6 https://github.com/galaxyproject/galaxy/commit/b0d094481a81d4efed4ca3916da6e... Author: John Chilton <jmchilton@gmail.com> Date: 2018-03-20 (Tue, 20 Mar 2018) Changed paths: M lib/galaxy/tools/deps/container_resolvers/mulled.py M lib/galaxy/tools/deps/docker_util.py Log Message: ----------- [17.09] Fix mulled docker caching. Broken with 93ffc4055b145811b86191dae8b865ea45b55fcb. Alternative to https://github.com/galaxyproject/galaxy/pull/5248 that does not use ``shell=True``. Rebased with cleanup from @nsoranzo. 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. Commit: beb28d4aff2a9c38f06a357f9ee013566ad635c6 https://github.com/galaxyproject/galaxy/commit/beb28d4aff2a9c38f06a357f9ee01... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-03-23 (Fri, 23 Mar 2018) Changed paths: M lib/galaxy/tools/deps/container_resolvers/mulled.py M lib/galaxy/tools/deps/docker_util.py Log Message: ----------- Merge pull request #5735 from jmchilton/fix_mulled_docker_caching [17.09] Fix mulled docker caching. Commit: 6fb738b01a48a495a68ded61371d10b4bd306d8e https://github.com/galaxyproject/galaxy/commit/6fb738b01a48a495a68ded61371d1... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-03-26 (Mon, 26 Mar 2018) Changed paths: M lib/galaxy/tools/deps/container_resolvers/mulled.py M lib/galaxy/tools/deps/docker_util.py Log Message: ----------- Merge branch 'release_17.09' into release_18.01 Commit: ca2ed15fda1032aef308aa87fa770356e1f3e5c2 https://github.com/galaxyproject/galaxy/commit/ca2ed15fda1032aef308aa87fa770... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-03-26 (Mon, 26 Mar 2018) Changed paths: M lib/galaxy/tools/deps/container_resolvers/mulled.py M lib/galaxy/tools/deps/docker_util.py M lib/galaxy/webapps/galaxy/api/configuration.py Log Message: ----------- Merge branch 'release_18.01' into dev Compare: https://github.com/galaxyproject/galaxy/compare/1993ef5c69fe...ca2ed15fda10