Branch: refs/heads/release_18.05 Home: https://github.com/galaxyproject/galaxy Commit: 9794d835e507c31d82aa82c79e86998154419980 https://github.com/galaxyproject/galaxy/commit/9794d835e507c31d82aa82c79e869... Author: John Chilton <jmchilton@gmail.com> Date: 2018-07-25 (Wed, 25 Jul 2018) Changed paths: M lib/galaxy/tools/parser/output_objects.py M test/api/test_tools.py Log Message: ----------- Fix to_dict with io_details=True for tools with collection outputs. Fixes #6537 and includes a test case. Commit: 0a9010156e30a20d730324807c3e238510f44b77 https://github.com/galaxyproject/galaxy/commit/0a9010156e30a20d730324807c3e2... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2018-07-26 (Thu, 26 Jul 2018) Changed paths: M lib/galaxy/tools/parser/output_objects.py M test/api/test_tools.py Log Message: ----------- Merge pull request #6538 from jmchilton/tool_output_io [18.01] Fix to_dict with io_details=True for tools with collection outputs. Commit: ba47188f5e896d9f2bd6718796093f05e1c7aa9b https://github.com/galaxyproject/galaxy/commit/ba47188f5e896d9f2bd6718796093... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-08-06 (Mon, 06 Aug 2018) Changed paths: M test/api/test_workflows.py M test/base/workflows_format_2/converter.py Log Message: ----------- Introduce test for auto-labelling subworkflow workflow outputs Commit: 21fd74e640c2ba872d98259ea213e20e99c6ba75 https://github.com/galaxyproject/galaxy/commit/21fd74e640c2ba872d98259ea213e... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-08-06 (Mon, 06 Aug 2018) Changed paths: M lib/galaxy/workflow/modules.py Log Message: ----------- Use subworkflow index when setting auto-label Previously this would reference the parent workflow index, while the get_data module would use the subworkflow index. This means defining workflows worked fine, but executing would fail when trying to find the output to replace. Using the subworkflow index here seems like the correct thing to do. Fixes https://github.com/galaxyproject/galaxy/issues/6560 Commit: 6d9df51f36e293bd1ce20d3bf9e21a5646ff5b94 https://github.com/galaxyproject/galaxy/commit/6d9df51f36e293bd1ce20d3bf9e21... Author: Dannon <dannon.baker@gmail.com> Date: 2018-08-06 (Mon, 06 Aug 2018) Changed paths: M lib/galaxy/workflow/modules.py M test/api/test_workflows.py M test/base/workflows_format_2/converter.py Log Message: ----------- Merge pull request #6570 from mvdbeek/fix_auto_labelling_and_output_recovery [18.01] Use subworkflow index when setting auto-label Commit: d7959568f85b45f378f6972d971075f7169cffc4 https://github.com/galaxyproject/galaxy/commit/d7959568f85b45f378f6972d97107... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-08-06 (Mon, 06 Aug 2018) Changed paths: M lib/galaxy/tools/parser/output_objects.py M lib/galaxy/workflow/modules.py M test/api/test_tools.py M test/api/test_workflows.py M test/base/workflows_format_2/converter.py Log Message: ----------- Merge branch 'release_18.01' into release_18.05 Compare: https://github.com/galaxyproject/galaxy/compare/6c7b9a3c7d44...d7959568f85b **NOTE:** This service has 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.