Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: e901a0c867cfa9af3420536c4725cbc001621cf8 https://github.com/galaxyproject/galaxy/commit/e901a0c867cfa9af3420536c4725c... Author: John Chilton <jmchilton@gmail.com> Date: 2017-08-08 (Tue, 08 Aug 2017) Changed paths: M lib/galaxy/managers/workflows.py Log Message: ----------- Bugfix for loading subworkflows from workflow descriptions. Sometimes unrelated workflow steps can be flushed in a half complete state and violate integrity constraints when a subworkflow step causes a flush of during the load of a different step. This fixes that by preloading all subworkflows during workflow import. This PR doesn't include a test case but one will be included if the CWL branch is merged at a later date (xref https://github.com/common-workflow-language/common-workflow-language/pull/49...). Commit: e594152de2dd33dbdff2feb8e05f05ad5810ab27 https://github.com/galaxyproject/galaxy/commit/e594152de2dd33dbdff2feb8e05f0... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2017-08-14 (Mon, 14 Aug 2017) Changed paths: M lib/galaxy/managers/workflows.py Log Message: ----------- Merge pull request #4394 from jmchilton/subworkflow_loading_fix Bugfix for loading subworkflows from workflow descriptions. Compare: https://github.com/galaxyproject/galaxy/compare/8e192dbf4ca2...e594152de2dd