Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: d0b06a3b1da09ff3394e9ea036d788676817b58f https://github.com/galaxyproject/galaxy/commit/d0b06a3b1da09ff3394e9ea036d78... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-08-14 (Mon, 14 Aug 2017) Changed paths: M lib/galaxy/workflow/modules.py Log Message: ----------- Don't cast tool_version to string if tool_version is None-type If a version is not specifically requested a wrong version (`None` cast to `'None'`) of a tool will be loaded in the workflow editor instead of the latest version. That should address @martenson's remark in https://github.com/galaxyproject/galaxy/pull/4373#issuecomment-321896674 (and maybe also https://github.com/galaxyproject/galaxy/issues/557#issuecomment-213498153). Commit: 6ad6fd9252bf5ec44beb00cb434876e170dc9548 https://github.com/galaxyproject/galaxy/commit/6ad6fd9252bf5ec44beb00cb43487... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-08-14 (Mon, 14 Aug 2017) Changed paths: M lib/galaxy/model/tool_shed_install/__init__.py Log Message: ----------- Rebuild tool_version_cache on DetachedInstanceError Commit: 7f78ee7b18b83961b305cac19aa8949a4452710d https://github.com/galaxyproject/galaxy/commit/7f78ee7b18b83961b305cac19aa89... Author: John Chilton <jmchilton@gmail.com> Date: 2017-08-15 (Tue, 15 Aug 2017) Changed paths: M lib/galaxy/model/tool_shed_install/__init__.py M lib/galaxy/workflow/modules.py Log Message: ----------- Merge pull request #4420 from mvdbeek/fix_wrong_tool_version_cast [17.05] Don't cast tool_version to string if tool_version is None-type Commit: 07a30499994b33e27c0b1765df9f32c9bfcea0b2 https://github.com/galaxyproject/galaxy/commit/07a30499994b33e27c0b1765df9f3... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-08-15 (Tue, 15 Aug 2017) Changed paths: M lib/galaxy/workflow/modules.py Log Message: ----------- Merge branch 'release_17.05' into dev Conflicts: lib/galaxy/model/tool_shed_install/__init__.py Commit: 462b7def5d9b9298d50cea2e62cfbf89bd463d25 https://github.com/galaxyproject/galaxy/commit/462b7def5d9b9298d50cea2e62cfb... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-08-15 (Tue, 15 Aug 2017) Changed paths: M lib/galaxy/workflow/modules.py Log Message: ----------- Merge pull request #4427 from nsoranzo/merge_release_17.05 Merge release_17.05 into dev Compare: https://github.com/galaxyproject/galaxy/compare/27be24963837...462b7def5d9b