Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 4b0ae30a83aeb86a821ec15cfa87e6af7e160a03 https://github.com/galaxyproject/galaxy/commit/4b0ae30a83aeb86a821ec15cfa87e... Author: takadonet <philipmabon@gmail.com> Date: 2018-07-12 (Thu, 12 Jul 2018) Changed paths: M tools/data_source/upload.py Log Message: ----------- Added fix to ensure that original ftp files that have been uploaded are purged if set in galaxy.yml with flag ftp_upload_purge. Address issue #6492 Commit: fd33c5c6d6aa2478654da74c7e80efdcf31e09a7 https://github.com/galaxyproject/galaxy/commit/fd33c5c6d6aa2478654da74c7e80e... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2018-07-13 (Fri, 13 Jul 2018) Changed paths: M tools/data_source/upload.py Log Message: ----------- Merge pull request #6497 from martenson/backport-takadonet [18.05] backport ftp purge fix Commit: 7b8e4f9e740725861951535d59e50243e4a0b2e0 https://github.com/galaxyproject/galaxy/commit/7b8e4f9e740725861951535d59e50... Author: John Chilton <jmchilton@gmail.com> Date: 2018-07-17 (Tue, 17 Jul 2018) Changed paths: M lib/galaxy/datatypes/proteomics.py M lib/galaxy/datatypes/sniff.py A lib/galaxy/datatypes/test/empty.txt Log Message: ----------- Fix empty datatypes. Commit: ef702e1458f746299710e9ce5afb7b350b61f91c https://github.com/galaxyproject/galaxy/commit/ef702e1458f746299710e9ce5afb7... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-07-17 (Tue, 17 Jul 2018) Changed paths: M lib/galaxy/datatypes/proteomics.py M lib/galaxy/datatypes/sniff.py A lib/galaxy/datatypes/test/empty.txt Log Message: ----------- Merge pull request #6510 from nsoranzo/release_18.05_backport_29f8e29b0bf5d50c0b735aa707d2a61623cc805b [18.05] Fix infinite loop in uploads Commit: 6c668774f7cac2098bc32a3123471a0eb62f384c https://github.com/galaxyproject/galaxy/commit/6c668774f7cac2098bc32a3123471... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-07-18 (Wed, 18 Jul 2018) Log Message: ----------- Merge branch 'release_18.05' into dev Compare: https://github.com/galaxyproject/galaxy/compare/e8b437dfd8e0...6c668774f7ca **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.