Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: aadf828d15a599b4b8e550ea912ad65c149ba561 https://github.com/galaxyproject/galaxy/commit/aadf828d15a599b4b8e550ea912ad... Author: John Chilton <jmchilton@gmail.com> Date: 2018-03-15 (Thu, 15 Mar 2018) Changed paths: M client/galaxy/scripts/mvc/collection/collection-model.js M client/galaxy/scripts/mvc/dataset/dataset-model.js Log Message: ----------- Fix for merging of HDA & DCE models into one model in the client. I wish they weren't merged together like this but they are so try to to handle the IDs in a less buggy way. Should fix https://github.com/galaxyproject/galaxy/issues/3782 though I'm unsure. Commit: 63f3b0c0041e99ded69215062714f7293bb77302 https://github.com/galaxyproject/galaxy/commit/63f3b0c0041e99ded69215062714f... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-03-15 (Thu, 15 Mar 2018) Changed paths: M client/galaxy/scripts/mvc/collection/collection-model.js M client/galaxy/scripts/mvc/dataset/dataset-model.js Log Message: ----------- Merge pull request #5703 from jmchilton/unwind_client_model_merge_issues_maybe_but_who_knows_how_are_the_tests Fix for merging of HDA & DCE models into one model in the client. Compare: https://github.com/galaxyproject/galaxy/compare/1df477b9218a...63f3b0c0041e