Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 98a9c86badd87a4db4a815490c06c717b67fced0 https://github.com/galaxyproject/galaxy/commit/98a9c86badd87a4db4a815490c06c... Author: John Chilton <jmchilton@gmail.com> Date: 2018-10-06 (Sat, 06 Oct 2018) Changed paths: M lib/galaxy/tools/tag_collection_from_file.xml M lib/galaxy/tools/verify/interactor.py M lib/galaxy/tools/xsd/galaxy.xsd Log Message: ----------- Allow testing tags in input collections. Commit: 9044e614f03b4d0daa3e67e32be15d7d3f1268f1 https://github.com/galaxyproject/galaxy/commit/9044e614f03b4d0daa3e67e32be15... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-10-07 (Sun, 07 Oct 2018) Changed paths: M client/package.json M client/yarn.lock Log Message: ----------- Upgrade concurrently; this fixes a 'null' return from webpack run vi aconcurrently, which can fail the build in some situations. Commit: 58ea67eb457ce154e1d119e94c07a81a1e617ba4 https://github.com/galaxyproject/galaxy/commit/58ea67eb457ce154e1d119e94c07a... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-10-07 (Sun, 07 Oct 2018) Changed paths: M lib/galaxy/tools/tag_collection_from_file.xml M lib/galaxy/tools/verify/interactor.py M lib/galaxy/tools/xsd/galaxy.xsd Log Message: ----------- Merge pull request #6823 from jmchilton/tag_input_tests [18.09] Allow testing tags in input collections. Commit: b99fedefa81b3ca59c27eb64ea9a7e9865cd9db8 https://github.com/galaxyproject/galaxy/commit/b99fedefa81b3ca59c27eb64ea9a7... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-10-08 (Mon, 08 Oct 2018) Changed paths: M lib/galaxy/tools/deps/mulled/mulled_build.py M lib/galaxy/tools/deps/mulled/mulled_build_channel.py M lib/galaxy/tools/deps/resolvers/conda.py Log Message: ----------- Update to latest galaxy-lib Includes: - change channel priority ( https://github.com/galaxyproject/galaxy-lib/pull/132 ) - channel cleanup ( https://github.com/galaxyproject/galaxy-lib/pull/136 ) Commit: c83c5cb78475c96d8e49510619c76f737cca5c8e https://github.com/galaxyproject/galaxy/commit/c83c5cb78475c96d8e49510619c76... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-10-08 (Mon, 08 Oct 2018) Changed paths: M doc/source/admin/conda_faq.rst M doc/source/admin/dependency_resolvers.rst M doc/source/admin/framework_dependencies.rst M lib/galaxy/dependencies/conda-file.sh M lib/galaxy/webapps/galaxy/config_schema.yml Log Message: ----------- Change conda channel priority: conda-forge > bioconda xref. https://github.com/bioconda/bioconda-utils/issues/330 Commit: 9b6833b5a04cea06d245086b7b74a24a524b0064 https://github.com/galaxyproject/galaxy/commit/9b6833b5a04cea06d245086b7b74a... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-10-08 (Mon, 08 Oct 2018) Changed paths: M config/galaxy.yml.sample M doc/source/admin/galaxy_options.rst Log Message: ----------- make config-rebuild Commit: 5205ed7eebe4b9a2a25d0f19abd5fd732f42e302 https://github.com/galaxyproject/galaxy/commit/5205ed7eebe4b9a2a25d0f19abd5f... Author: John Chilton <jmchilton@gmail.com> Date: 2018-10-08 (Mon, 08 Oct 2018) Changed paths: M client/package.json M client/yarn.lock Log Message: ----------- Merge pull request #6828 from dannon/null_exit_bug_fix [18.09] Upgrade concurrently for 'null' return fix Commit: a43a60656a49ad0b53574dce61738764cf466287 https://github.com/galaxyproject/galaxy/commit/a43a60656a49ad0b53574dce61738... Author: Dannon <dannon.baker@gmail.com> Date: 2018-10-09 (Tue, 09 Oct 2018) Changed paths: M config/galaxy.yml.sample M doc/source/admin/conda_faq.rst M doc/source/admin/dependency_resolvers.rst M doc/source/admin/framework_dependencies.rst M doc/source/admin/galaxy_options.rst M lib/galaxy/dependencies/conda-file.sh M lib/galaxy/tools/deps/mulled/mulled_build.py M lib/galaxy/tools/deps/mulled/mulled_build_channel.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/webapps/galaxy/config_schema.yml Log Message: ----------- Merge pull request #6830 from nsoranzo/release_18.09_channel_priority_update [18.09] Update conda channel priority: conda-forge > bioconda Commit: afa7299705b92972979d63aa83e6e2f7080b5508 https://github.com/galaxyproject/galaxy/commit/afa7299705b92972979d63aa83e6e... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-10-10 (Wed, 10 Oct 2018) Changed paths: M client/package.json M client/yarn.lock M config/galaxy.yml.sample M doc/source/admin/conda_faq.rst M doc/source/admin/dependency_resolvers.rst M doc/source/admin/framework_dependencies.rst M doc/source/admin/galaxy_options.rst M lib/galaxy/dependencies/conda-file.sh M lib/galaxy/tools/deps/mulled/mulled_build.py M lib/galaxy/tools/deps/mulled/mulled_build_channel.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/tag_collection_from_file.xml M lib/galaxy/tools/verify/interactor.py M lib/galaxy/tools/xsd/galaxy.xsd M lib/galaxy/webapps/galaxy/config_schema.yml Log Message: ----------- Merge branch 'release_18.09' into dev Compare: https://github.com/galaxyproject/galaxy/compare/dee3ce981c70...afa7299705b9 **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.