Branch: refs/heads/usegalaxy Home: https://github.com/galaxyproject/galaxy Commit: 5b46c431b416e619a7ac5467527ab30743eabd33 https://github.com/galaxyproject/galaxy/commit/5b46c431b416e619a7ac5467527ab... Author: John Chilton <jmchilton@gmail.com> Date: 2017-04-03 (Mon, 03 Apr 2017) Changed paths: M lib/galaxy/tools/actions/__init__.py M test/api/test_tools.py A test/functional/tools/identifier_multiple_in_conditional.xml A test/functional/tools/identifier_multiple_in_repeat.xml M test/functional/tools/samples_tool_conf.xml Log Message: ----------- Fix certain aspects of dataset reductions in conditionals/repeats. For instance, fixes #3859 restoring the correct ``element_identifier`` for reduces collections in conditionals. Add tests for combinations of repeats and conditionals. Commit: 3c080cae96aadccd824aa7cf6fda9c4b5bf7471a https://github.com/galaxyproject/galaxy/commit/3c080cae96aadccd824aa7cf6fda9... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-04-03 (Mon, 03 Apr 2017) Changed paths: M lib/galaxy/tools/actions/__init__.py M test/api/test_tools.py A test/functional/tools/identifier_multiple_in_conditional.xml A test/functional/tools/identifier_multiple_in_repeat.xml M test/functional/tools/samples_tool_conf.xml Log Message: ----------- Merge pull request #3864 from jmchilton/fix_identifiers_in_conditionals [17.01] Fix certain aspects of collection reductions in conditionals/repeats. Commit: 83c8291976048ee1bec4047963b82ae805292b99 https://github.com/galaxyproject/galaxy/commit/83c8291976048ee1bec4047963b82... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-04-03 (Mon, 03 Apr 2017) Changed paths: M lib/galaxy/tools/actions/__init__.py M test/api/test_tools.py A test/functional/tools/identifier_multiple_in_conditional.xml A test/functional/tools/identifier_multiple_in_repeat.xml M test/functional/tools/samples_tool_conf.xml Log Message: ----------- Merge pull request #3867 from galaxyproject/release_17.01 [usegalaxy] merge Release 17.01 Compare: https://github.com/galaxyproject/galaxy/compare/aafb8e305ace...83c829197604