Branch: refs/heads/release_18.05 Home: https://github.com/galaxyproject/galaxy Commit: 7eb927b631a3677a74b055fc275b90827bcdff21 https://github.com/galaxyproject/galaxy/commit/7eb927b631a3677a74b055fc275b9... Author: John Chilton jmchilton@gmail.com Date: 2018-06-08 (Fri, 08 Jun 2018)

Changed paths: M client/galaxy/scripts/mvc/history/hdca-li-edit.js

Log Message: ----------- Fix delete "Collection Only" option in history menu.

Broken with https://github.com/galaxyproject/galaxy/commit/7cc01380afd017c5cac2af2b2d735....

Commit: 9957c027375c436b64299240982a2165d83b7ff3 https://github.com/galaxyproject/galaxy/commit/9957c027375c436b64299240982a2... Author: John Chilton jmchilton@gmail.com Date: 2018-06-08 (Fri, 08 Jun 2018)

Changed paths: M client/galaxy/scripts/components/RuleCollectionBuilder.vue

Log Message: ----------- Fix file type error in RuleCollectionBuilder.

Commit: 3c36bec2903e6c012428912c424f4ad762d1b96a https://github.com/galaxyproject/galaxy/commit/3c36bec2903e6c012428912c424f4... Author: Sebastian Kapust sebastian@kapust.org Date: 2018-06-08 (Fri, 08 Jun 2018)

Changed paths: M config/plugins/webhooks/demo/search/script.js

Log Message: ----------- Fix tool search overlay link

Commit: 96fbe9702dc07eb965a6e6ede3db8e9df91f8e19 https://github.com/galaxyproject/galaxy/commit/96fbe9702dc07eb965a6e6ede3db8... Author: Martin Cech marten@bx.psu.edu Date: 2018-06-08 (Fri, 08 Jun 2018)

Changed paths: M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/extended.bundled.js M static/scripts/bundled/libs.bundled.js M static/scripts/mvc/history/hdca-li-edit.js M static/scripts/mvc/history/history-contents.js M static/scripts/mvc/tool/tool-form-composite.js

Log Message: ----------- backport and build client

Commit: dba21dc8a42640b679d1076bb7f8089028aa31fa https://github.com/galaxyproject/galaxy/commit/dba21dc8a42640b679d1076bb7f80... Author: John Chilton jmchilton@gmail.com Date: 2018-06-08 (Fri, 08 Jun 2018)

Changed paths: M client/galaxy/scripts/components/RuleCollectionBuilder.vue M client/galaxy/scripts/mvc/history/hdca-li-edit.js M config/plugins/webhooks/demo/search/script.js M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/extended.bundled.js M static/scripts/bundled/libs.bundled.js M static/scripts/mvc/history/hdca-li-edit.js M static/scripts/mvc/history/history-contents.js M static/scripts/mvc/tool/tool-form-composite.js

Log Message: ----------- Merge pull request #6311 from martenson/backport-and-build

[18.05] Backport and build client changes

Compare: https://github.com/galaxyproject/galaxy/compare/a56c4e9cf6b9...dba21dc8a426 **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

Functionality will be removed from GitHub.com on January 31st, 2019.