Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: c6403acd0f18196c0453a90fe89ccf861d7a28d6 https://github.com/galaxyproject/galaxy/commit/c6403acd0f18196c0453a90fe89cc... Author: John Chilton <jmchilton@gmail.com> Date: 2018-06-20 (Wed, 20 Jun 2018) Changed paths: M lib/galaxy/tools/parameters/output_collect.py Log Message: ----------- Fix logging bug. Commit: 6d5be41b320510d6e2d163399a3a6e30d6f9bda0 https://github.com/galaxyproject/galaxy/commit/6d5be41b320510d6e2d163399a3a6... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-06-20 (Wed, 20 Jun 2018) Changed paths: M lib/galaxy/tools/parameters/output_collect.py Log Message: ----------- Merge pull request #6366 from jmchilton/job_log_bug [18.05] Fix small bug in logging output name in job finish. Commit: 572f38d1fb47e914ad10766007c855786e1643a2 https://github.com/galaxyproject/galaxy/commit/572f38d1fb47e914ad10766007c85... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-06-21 (Thu, 21 Jun 2018) Changed paths: M scripts/grt/export.py Log Message: ----------- move the sanitization to the try/except block as it may fail (and it did, on Main) Commit: d28ab2a4f31b363c236a02a535cc43ab049190ca https://github.com/galaxyproject/galaxy/commit/d28ab2a4f31b363c236a02a535cc4... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-06-21 (Thu, 21 Jun 2018) Changed paths: M scripts/grt/export.py Log Message: ----------- Merge pull request #6377 from martenson/catch-sanitization-faults [18.05] Catch sanitization faults Commit: 9967639bac92eb3f7103794663f41b88f11baa9c https://github.com/galaxyproject/galaxy/commit/9967639bac92eb3f7103794663f41... Author: guerler <aysam.guerler@gmail.com> Date: 2018-06-22 (Fri, 22 Jun 2018) Changed paths: M lib/galaxy/managers/workflows.py Log Message: ----------- Comma-separate tool names in missing tools error message Commit: 22d383c39842e0a0198cf2d37ad3832ea1838769 https://github.com/galaxyproject/galaxy/commit/22d383c39842e0a0198cf2d37ad38... Author: Dannon <dannon.baker@gmail.com> Date: 2018-06-22 (Fri, 22 Jun 2018) Changed paths: M lib/galaxy/managers/workflows.py Log Message: ----------- Merge pull request #6378 from guerler/commaseperror [18.05] Comma-separate tool names in missing tools error message Commit: fa2b6baef71984c0559c53ff5750d1fe9b77163e https://github.com/galaxyproject/galaxy/commit/fa2b6baef71984c0559c53ff5750d... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-06-22 (Fri, 22 Jun 2018) Changed paths: M config/datatypes_conf.xml.sample A lib/galaxy/datatypes/converters/bam_to_bai.xml Log Message: ----------- Revert "Remove bam to bai converter" This reverts commit 7e2727bc0a74868198e7e457f99df3d1e39f1ddb. Commit: 5f24794efdad757b77c75c3aa111da7a11c5bb47 https://github.com/galaxyproject/galaxy/commit/5f24794efdad757b77c75c3aa111d... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-06-22 (Fri, 22 Jun 2018) Changed paths: M config/datatypes_conf.xml.sample Log Message: ----------- Add basic .bai datatype Commit: 36706e9eb38728c91c1da2a4cf66ff49f3f44d72 https://github.com/galaxyproject/galaxy/commit/36706e9eb38728c91c1da2a4cf66f... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-06-22 (Fri, 22 Jun 2018) Changed paths: M config/datatypes_conf.xml.sample A lib/galaxy/datatypes/converters/bam_to_bai.xml Log Message: ----------- Merge pull request #6385 from dannon/revert-baiconverter-removal [18.01] Revert "Remove bam to bai converter" Commit: e0c269291a20ae3a01a24bae930012baba3bb10c https://github.com/galaxyproject/galaxy/commit/e0c269291a20ae3a01a24bae93001... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-06-23 (Sat, 23 Jun 2018) Changed paths: M config/datatypes_conf.xml.sample A lib/galaxy/datatypes/converters/bam_to_bai.xml Log Message: ----------- Merge branch 'release_18.01' into release_18.05 Commit: 31e78461bd1e61ca8cc3dcdf0b6e08500b8ee2f1 https://github.com/galaxyproject/galaxy/commit/31e78461bd1e61ca8cc3dcdf0b6e0... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-06-23 (Sat, 23 Jun 2018) Changed paths: M config/datatypes_conf.xml.sample A lib/galaxy/datatypes/converters/bam_to_bai.xml M lib/galaxy/managers/workflows.py M lib/galaxy/tools/parameters/output_collect.py M scripts/grt/export.py Log Message: ----------- Merge branch 'release_18.05' into dev Compare: https://github.com/galaxyproject/galaxy/compare/04b69d399b70...31e78461bd1e **NOTE:** This service 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.