Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 4fc9fe2150690c04d4d6071994126a05b250379b https://github.com/galaxyproject/galaxy/commit/4fc9fe2150690c04d4d6071994126... Author: Sebastian Kapust <sebastian@kapust.org> Date: 2018-09-11 (Tue, 11 Sep 2018) Changed paths: M client/galaxy/scripts/mvc/ui/ui-rules-edit.js Log Message: ----------- Fix target update for rule collection builder after input selection Commit: a937bc5539414624fe42c49607416f14dadd425b https://github.com/galaxyproject/galaxy/commit/a937bc5539414624fe42c49607416... Author: John Chilton <jmchilton@gmail.com> Date: 2018-09-11 (Tue, 11 Sep 2018) Changed paths: M static/scripts/bundled/libs.bundled.js M static/scripts/mvc/ui/ui-rules-edit.js Log Message: ----------- Client build. Commit: 2a79ae0ce1bbefe8a0340edb4882a00f07fc6de2 https://github.com/galaxyproject/galaxy/commit/2a79ae0ce1bbefe8a0340edb4882a... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2018-09-12 (Wed, 12 Sep 2018) Changed paths: M client/galaxy/scripts/mvc/ui/ui-rules-edit.js M static/scripts/bundled/libs.bundled.js M static/scripts/mvc/ui/ui-rules-edit.js Log Message: ----------- Merge pull request #6691 from jmchilton/backport_6326 [18.05] Backport #6326 Commit: bddabe3029335a7db51a0ef1c6a7508937db33fa https://github.com/galaxyproject/galaxy/commit/bddabe3029335a7db51a0ef1c6a75... Author: Dave B <dave@bx.psu.edu> Date: 2018-09-12 (Wed, 12 Sep 2018) Changed paths: M lib/galaxy/webapps/galaxy/buildapp.py Log Message: ----------- Add missing route for API endpoint. Commit: 1dacc35332cf956ed5631fe8c6fa8e231dab663e https://github.com/galaxyproject/galaxy/commit/1dacc35332cf956ed5631fe8c6fa8... Author: Dannon <dannon.baker@gmail.com> Date: 2018-09-12 (Wed, 12 Sep 2018) Changed paths: M lib/galaxy/webapps/galaxy/buildapp.py Log Message: ----------- Merge pull request #6703 from davebx/updates_api [18.05] Add missing route for API endpoint. Commit: 7e2a77e8af152a501f124a6d0f702a66502e0dd3 https://github.com/galaxyproject/galaxy/commit/7e2a77e8af152a501f124a6d0f702... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-09-12 (Wed, 12 Sep 2018) Changed paths: M lib/galaxy/jobs/runners/slurm.py Log Message: ----------- Catch additional permutations of Slurm cgroup creation warnings Commit: f7c1d31dbc6f23eb4fba37b82aeb2808fd69224f https://github.com/galaxyproject/galaxy/commit/f7c1d31dbc6f23eb4fba37b82aeb2... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-09-12 (Wed, 12 Sep 2018) Changed paths: M lib/galaxy/webapps/galaxy/api/tools.py Log Message: ----------- unquote the tool_version in the tools API if the tool version includes '+', which is a recommended way of versioning per https://galaxy-iuc-standards.readthedocs.io/en/latest/best_practices/tool_xm... this would fail the comparison down the line in the toolbox.get_tool() method this commit also downgrades the unquote_plus to unquote for tool_id for similar reasons since it also contains the version Commit: 1b6d422afdd0c1f7291a0999bfc54284b90972d2 https://github.com/galaxyproject/galaxy/commit/1b6d422afdd0c1f7291a0999bfc54... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-09-13 (Thu, 13 Sep 2018) Changed paths: M lib/galaxy/webapps/galaxy/api/workflows.py Log Message: ----------- unquote similarly to previous commit but in the workflow controller Commit: f513594c31a3738420889b3f5e36d39796946587 https://github.com/galaxyproject/galaxy/commit/f513594c31a3738420889b3f5e36d... Author: Dannon <dannon.baker@gmail.com> Date: 2018-09-14 (Fri, 14 Sep 2018) Changed paths: M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/webapps/galaxy/api/workflows.py Log Message: ----------- Merge pull request #6707 from martenson/unqoute_tool_version [18.05] unquote the tool_version in the tools API Commit: 3d508a01d3d58908b667e428f125df91d8c599c1 https://github.com/galaxyproject/galaxy/commit/3d508a01d3d58908b667e428f125d... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-09-14 (Fri, 14 Sep 2018) Changed paths: M lib/galaxy/jobs/runners/slurm.py Log Message: ----------- Improvements from @nsoranzo Commit: 6993dbb6fcd112e077fbad66deae716a53247d07 https://github.com/galaxyproject/galaxy/commit/6993dbb6fcd112e077fbad66deae7... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-09-14 (Fri, 14 Sep 2018) Changed paths: M lib/galaxy/jobs/runners/slurm.py Log Message: ----------- Merge pull request #6705 from natefoo/slurm-cgroup-enospc [18.05] Catch additional permutations of Slurm cgroup creation warnings Commit: 18d99deb951a8d429be5695fac539c93e4c90e3e https://github.com/galaxyproject/galaxy/commit/18d99deb951a8d429be5695fac539... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-09-19 (Wed, 19 Sep 2018) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/package.json M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/webapps/galaxy/api/workflows.py M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/chart.bundled.js M static/scripts/bundled/extended.bundled.js Log Message: ----------- Decode tool id and version in the client, not in the API using `decodeUriComponent` from `decode-uri-component` JS package. Revert https://github.com/galaxyproject/galaxy/pull/6707 Remove unused `_get_tool()` method in `lib/galaxy/webapps/galaxy/api/workflows.py` . Rebuild client with: ``` make client-production-maps ``` Commit: 7f38e61caebe8e56ab1f6cf6d5b577c6b020c9d3 https://github.com/galaxyproject/galaxy/commit/7f38e61caebe8e56ab1f6cf6d5b57... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-09-19 (Wed, 19 Sep 2018) Changed paths: R lib/galaxy/dependencies/requirements.txt Log Message: ----------- Remove again lib/galaxy/dependencies/requirements.txt It was reintroduced (empty) by mistake in https://github.com/galaxyproject/galaxy/pull/4474 . Commit: 35754dc49a7d29a12fe10c444ce69c1af47b0a2b https://github.com/galaxyproject/galaxy/commit/35754dc49a7d29a12fe10c444ce69... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-09-19 (Wed, 19 Sep 2018) Changed paths: M scripts/plugin_staging.py Log Message: ----------- Fix symlinking during plugin staging Remove also broken symlinks before creating the new ones. Commit: 5121275c1d5e7c724edbc3cef531f3401aea5225 https://github.com/galaxyproject/galaxy/commit/5121275c1d5e7c724edbc3cef531f... Author: John Chilton <jmchilton@gmail.com> Date: 2018-09-19 (Wed, 19 Sep 2018) Changed paths: M lib/galaxy/managers/users.py Log Message: ----------- Remove stray debug statement. Commit: 1cdcb80fe88cd076f5c966b0b6a4acab37841877 https://github.com/galaxyproject/galaxy/commit/1cdcb80fe88cd076f5c966b0b6a4a... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2018-09-19 (Wed, 19 Sep 2018) Changed paths: M lib/galaxy/managers/users.py Log Message: ----------- Merge pull request #6739 from jmchilton/remove_debug [18.09] Remove stray debug statement. Commit: 5635a05a2a70c3e8887c32b1a8675f124808fd49 https://github.com/galaxyproject/galaxy/commit/5635a05a2a70c3e8887c32b1a8675... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-09-19 (Wed, 19 Sep 2018) Changed paths: M client/galaxy/scripts/mvc/workflow/workflow-terminals.js M lib/galaxy/managers/workflows.py M lib/galaxy/workflow/modules.py M test/api/test_workflows.py M test/unit/workflows/test_modules.py Log Message: ----------- Look up collection_type if collection_type_source is set We do this in the wf-editor and in the backend, so this works for subworkflows. This should make quite some tools more usable in a workflow scenario. Should fix - https://github.com/galaxyproject/galaxy/issues/6514 - https://github.com/galaxyproject/galaxy/issues/6012 - https://github.com/galaxyproject/galaxy/issues/6569 - https://github.com/galaxyproject/galaxy/issues/1889 and perhaps more issues related to this. Commit: f7fe3418d63683a998425b99f4688872fef07b09 https://github.com/galaxyproject/galaxy/commit/f7fe3418d63683a998425b99f4688... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-09-19 (Wed, 19 Sep 2018) Changed paths: M client/galaxy/scripts/mvc/workflow/workflow-terminals.js Log Message: ----------- Reset collection_type if collection_type_source has been removed Commit: a52ee84aede53ff2cb5a3e667e4ef03df1fd3acb https://github.com/galaxyproject/galaxy/commit/a52ee84aede53ff2cb5a3e667e4ef... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-09-19 (Wed, 19 Sep 2018) Changed paths: M client/galaxy/scripts/mvc/workflow/workflow-connector.js M client/galaxy/scripts/mvc/workflow/workflow-terminals.js Log Message: ----------- Drop invalid connections if type_source is unavailable Commit: 29f07f0b0ad49b86b50c34e9890eb2117e067a2b https://github.com/galaxyproject/galaxy/commit/29f07f0b0ad49b86b50c34e9890eb... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-09-19 (Wed, 19 Sep 2018) Changed paths: M client/galaxy/scripts/mvc/workflow/workflow-connector.js M client/galaxy/scripts/mvc/workflow/workflow-terminals.js M lib/galaxy/managers/workflows.py M lib/galaxy/workflow/modules.py M test/api/test_workflows.py M test/unit/workflows/test_modules.py Log Message: ----------- Merge pull request #6741 from jmchilton/backport_type_source [18.09] Backport #6732 Commit: 840041744505402ab5af4f39b84ba76599cb8588 https://github.com/galaxyproject/galaxy/commit/840041744505402ab5af4f39b84ba... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-09-19 (Wed, 19 Sep 2018) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/package.json R lib/galaxy/dependencies/requirements.txt M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/webapps/galaxy/api/workflows.py M scripts/plugin_staging.py M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/chart.bundled.js M static/scripts/bundled/extended.bundled.js Log Message: ----------- Merge pull request #6737 from nsoranzo/release_18.05_revert_6707 [18.05] Decode tool id and version in the client, not in the API Commit: 4ce8086c2052a1abee4824456ddfd48ee5cb7c6a https://github.com/galaxyproject/galaxy/commit/4ce8086c2052a1abee4824456ddfd... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-09-19 (Wed, 19 Sep 2018) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/package.json R lib/galaxy/dependencies/requirements.txt M lib/galaxy/jobs/runners/slurm.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/webapps/galaxy/api/workflows.py M lib/galaxy/webapps/galaxy/buildapp.py M scripts/plugin_staging.py Log Message: ----------- Merge branch 'release_18.05' into release_18.09 Commit: 4723ad6672fef064a75934604ab03150ec14e872 https://github.com/galaxyproject/galaxy/commit/4723ad6672fef064a75934604ab03... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-09-19 (Wed, 19 Sep 2018) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/package.json R lib/galaxy/dependencies/requirements.txt M lib/galaxy/jobs/runners/slurm.py M lib/galaxy/managers/users.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/webapps/galaxy/api/workflows.py M scripts/plugin_staging.py Log Message: ----------- Merge branch 'release_18.09' into dev Compare: https://github.com/galaxyproject/galaxy/compare/c9f2361e8e1f...4723ad6672fe **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.