Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 3332dfb6717e9bd368341e0bc0aa51d3b53fa861 https://github.com/galaxyproject/galaxy/commit/3332dfb6717e9bd368341e0bc0aa5... Author: John Chilton jmchilton@gmail.com Date: 2017-05-04 (Thu, 04 May 2017)

Changed paths: M lib/galaxy/tools/deps/container_resolvers/explicit.py M lib/galaxy/util/plugin_config.py

Log Message: ----------- [17.05] Fix setting up explicit container resolution from a container resolution config file.

Commit: f26e358321481500d0f993e0d7b2be9bdd1047b8 https://github.com/galaxyproject/galaxy/commit/f26e358321481500d0f993e0d7b2b... Author: John Chilton jmchilton@gmail.com Date: 2017-05-05 (Fri, 05 May 2017)

Changed paths: M lib/galaxy/jobs/rule_helper.py M lib/galaxy/tools/deps/containers.py

Log Message: ----------- Fix docker_dispatch dynamic destination rule for container resolvers.

Commit: a9faa4873e4509a60822019afe3faa4cab3f8336 https://github.com/galaxyproject/galaxy/commit/a9faa4873e4509a60822019afe3fa... Author: John Chilton jmchilton@gmail.com Date: 2017-05-05 (Fri, 05 May 2017)

Changed paths: M lib/galaxy/jobs/rule_helper.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/tools/deps/container_resolvers/mulled.py M lib/galaxy/tools/deps/containers.py

Log Message: ----------- Do not attempt to use mulled containers if tool requires legacy Galaxy environment.

Commit: 04bb1e85cd16a04d6968c8d10755bd5e142831b1 https://github.com/galaxyproject/galaxy/commit/04bb1e85cd16a04d6968c8d10755b... Author: John Chilton jmchilton@gmail.com Date: 2017-05-11 (Thu, 11 May 2017)

Changed paths: M client/galaxy/scripts/mvc/upload/collection/collection-view.js M static/maps/mvc/upload/collection/collection-view.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js.map M static/scripts/mvc/upload/collection/collection-view.js

Log Message: ----------- [17.05] Fix FTP upload of multiple files in collection uploader.

Commit: aa1e4cea148ba6a1683d905704191e64ee64a46c https://github.com/galaxyproject/galaxy/commit/aa1e4cea148ba6a1683d905704191... Author: Martin Cech marten@bx.psu.edu Date: 2017-05-11 (Thu, 11 May 2017)

Changed paths: M client/galaxy/scripts/mvc/upload/collection/collection-view.js M static/maps/mvc/upload/collection/collection-view.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js.map M static/scripts/mvc/upload/collection/collection-view.js

Log Message: ----------- Merge pull request #4058 from jmchilton/upload_ftp_fix

[17.05] Fix FTP upload of multiple files in collection uploader.

Commit: 0bafd683f152f28a193ee39a415018e4a8952767 https://github.com/galaxyproject/galaxy/commit/0bafd683f152f28a193ee39a41501... Author: Martin Cech marten@bx.psu.edu Date: 2017-05-12 (Fri, 12 May 2017)

Changed paths: M lib/galaxy/tools/deps/container_resolvers/explicit.py M lib/galaxy/util/plugin_config.py

Log Message: ----------- Merge pull request #4020 from jmchilton/fix_explicit_container_resolver_from_config

[17.05] Fix setting up explicit container resolution...

Commit: 185c76605f2d0da1d8e261b9b3b3a626b8ba6226 https://github.com/galaxyproject/galaxy/commit/185c76605f2d0da1d8e261b9b3b3a... Author: Martin Cech marten@bx.psu.edu Date: 2017-05-12 (Fri, 12 May 2017)

Changed paths: M lib/galaxy/jobs/rule_helper.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/tools/deps/container_resolvers/mulled.py M lib/galaxy/tools/deps/containers.py

Log Message: ----------- Merge pull request #4033 from jmchilton/dispatch_fix

[17.05] Fixes for containerized job executions.

Commit: 5e880815ade8756964017a446c6ceaa5cbb72f1a https://github.com/galaxyproject/galaxy/commit/5e880815ade8756964017a446c6ce... Author: Eric Rasche rasche.eric@gmail.com Date: 2017-05-14 (Sun, 14 May 2017)

Changed paths: M config/plugins/webhooks/demo/search/config/searchover.yaml M config/plugins/webhooks/demo/tool_list/config/tool_list.yml M test/functional/webhooks/trans_object/config/trans_object.yaml

Log Message: ----------- Use galaxy.root by default

Commit: 88c0635ef70d8054b50dcbfae2788a9cfa7bd973 https://github.com/galaxyproject/galaxy/commit/88c0635ef70d8054b50dcbfae2788... Author: Eric Rasche rasche.eric@gmail.com Date: 2017-05-14 (Sun, 14 May 2017)

Changed paths: M doc/source/admin/special_topics/webhooks.rst

Log Message: ----------- Link has already rotted

Commit: 6dd145ed1a97263eb9cca42f26613e28b22f177d https://github.com/galaxyproject/galaxy/commit/6dd145ed1a97263eb9cca42f26613... Author: Eric Rasche rasche.eric@gmail.com Date: 2017-05-14 (Sun, 14 May 2017)

Changed paths: M doc/source/admin/special_topics/webhooks.rst

Log Message: ----------- Try and document a bit

Commit: bd83608a2fb9ac6e8ec0391ab803f569e134d4fa https://github.com/galaxyproject/galaxy/commit/bd83608a2fb9ac6e8ec0391ab803f... Author: guerler aysam.guerler@gmail.com Date: 2017-05-15 (Mon, 15 May 2017)

Changed paths: M client/galaxy/scripts/mvc/grid/grid-template.js M static/maps/mvc/grid/grid-template.js.map M static/scripts/mvc/grid/grid-template.js

Log Message: ----------- Fix global grid action events

Commit: d3427a1344d165cf6b76b3e2ef4c2113f5ea1916 https://github.com/galaxyproject/galaxy/commit/d3427a1344d165cf6b76b3e2ef4c2... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-05-15 (Mon, 15 May 2017)

Changed paths: M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js.map

Log Message: ----------- Rebuild

Commit: 6614e94a4953a8352515edded517d060cd6265c7 https://github.com/galaxyproject/galaxy/commit/6614e94a4953a8352515edded517d... Author: Martin Cech marten@bx.psu.edu Date: 2017-05-15 (Mon, 15 May 2017)

Changed paths: M config/plugins/webhooks/demo/search/config/searchover.yaml M config/plugins/webhooks/demo/tool_list/config/tool_list.yml M doc/source/admin/special_topics/webhooks.rst M test/functional/webhooks/trans_object/config/trans_object.yaml

Log Message: ----------- Merge pull request #4065 from erasche/fix-4064

[17.05] Correct webhooks to use Galaxy.root and be compatible with proxy_prefix

Commit: 5eadd4842dcd2aedcc6a496d9bcaecd8048e4ead https://github.com/galaxyproject/galaxy/commit/5eadd4842dcd2aedcc6a496d9bcae... Author: Martin Cech marten@bx.psu.edu Date: 2017-05-16 (Tue, 16 May 2017)

Changed paths: M client/galaxy/scripts/mvc/grid/grid-template.js M client/galaxy/scripts/mvc/upload/collection/collection-view.js M config/plugins/webhooks/demo/search/config/searchover.yaml M config/plugins/webhooks/demo/tool_list/config/tool_list.yml M doc/source/admin/special_topics/webhooks.rst M lib/galaxy/jobs/rule_helper.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/tools/deps/container_resolvers/explicit.py M lib/galaxy/tools/deps/container_resolvers/mulled.py M lib/galaxy/tools/deps/containers.py M lib/galaxy/util/plugin_config.py M static/maps/mvc/grid/grid-template.js.map M static/maps/mvc/upload/collection/collection-view.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/grid/grid-template.js M static/scripts/mvc/upload/collection/collection-view.js M test/functional/webhooks/trans_object/config/trans_object.yaml

Log Message: ----------- Merge branch 'release_17.05' into dev

Compare: https://github.com/galaxyproject/galaxy/compare/18349b17b25e...5eadd4842dcd