Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 2eefe8571a00497c6faefff64cf86224bae05825 https://github.com/galaxyproject/galaxy/commit/2eefe8571a00497c6faefff64cf86... Author: John Chilton jmchilton@gmail.com Date: 2017-03-22 (Wed, 22 Mar 2017)
Changed paths: M client/galaxy/scripts/mvc/collection/list-collection-creator.js M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js M static/maps/mvc/collection/list-collection-creator.js.map M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/collection/list-collection-creator.js M static/scripts/mvc/collection/list-of-pairs-collection-creator.js
Log Message: ----------- Fix usage of _.extend in joint collection builder templates.
Fixes bug introduced in #3781. #minor
Commit: f8950feb30ca3caa94d48f487d9d7079839143a0 https://github.com/galaxyproject/galaxy/commit/f8950feb30ca3caa94d48f487d9d7... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-03-22 (Wed, 22 Mar 2017)
Changed paths: M client/galaxy/scripts/mvc/collection/list-collection-creator.js M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js M static/maps/mvc/collection/list-collection-creator.js.map M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/collection/list-collection-creator.js M static/scripts/mvc/collection/list-of-pairs-collection-creator.js
Log Message: ----------- Merge pull request #3799 from jmchilton/fix_extend_usage
Fix usage of _.extend in joint collection builder templates.
Compare: https://github.com/galaxyproject/galaxy/compare/3ed60db5ce9b...f8950feb30ca
galaxy-commits@lists.galaxyproject.org