Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: ffda4aa2cd033e8953ef780fb553afbc77e4a7f4 https://github.com/galaxyproject/galaxy/commit/ffda4aa2cd033e8953ef780fb553a... Author: Dave B <dave@bx.psu.edu> Date: 2015-10-19 (Mon, 19 Oct 2015) Changed paths: M lib/galaxy/model/orm/scripts.py M lib/galaxy/webapps/tool_shed/buildapp.py M test/docker/base/Dockerfile M test/docker/base/ansible_vars.yml M test/docker/base/provision.yml M test/docker/base/run_test_wrapper.sh M test/docker/base/start_mysql.sh Log Message: ----------- Allow dockerized toolshed tests. Commit: 096adbf8d0776d4b1085705f2881c2d46ab06611 https://github.com/galaxyproject/galaxy/commit/096adbf8d0776d4b1085705f2881c... Author: Dave B <dave@bx.psu.edu> Date: 2015-10-19 (Mon, 19 Oct 2015) Changed paths: M test/docker/base/Dockerfile Log Message: ----------- Collect apt installs in one place. Commit: 1766b896e30ed1b2bc5aa5341cf19d313628c4f4 https://github.com/galaxyproject/galaxy/commit/1766b896e30ed1b2bc5aa5341cf19... Author: Dave B <dave@bx.psu.edu> Date: 2015-10-20 (Tue, 20 Oct 2015) Changed paths: M client/galaxy/scripts/mvc/tools/tools-form-base.js M config/datatypes_conf.xml.sample M doc/source/admin/index.rst A doc/source/admin/useful_scripts.rst M doc/source/dev/faq.rst M lib/galaxy/datatypes/binary.py M lib/galaxy/tools/loader_directory.py M lib/galaxy/web/framework/middleware/remoteuser.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py M run_tests.sh A scripts/api/library_upload_dir.py M static/maps/mvc/tools/tools-form-base.js.map M static/scripts/mvc/tools/tools-form-base.js M test/docker/base/run_test_wrapper.sh Log Message: ----------- Merge -dev. Commit: 2dcb92aa0e83f9893595b68222fc62cf052a9220 https://github.com/galaxyproject/galaxy/commit/2dcb92aa0e83f9893595b68222fc6... Author: Martin Cech <cech.marten@gmail.com> Date: 2015-11-13 (Fri, 13 Nov 2015) Changed paths: M lib/galaxy/model/orm/scripts.py M lib/galaxy/webapps/tool_shed/buildapp.py M test/docker/base/Dockerfile M test/docker/base/ansible_vars.yml M test/docker/base/provision.yml M test/docker/base/run_test_wrapper.sh M test/docker/base/start_mysql.sh Log Message: ----------- Merge pull request #942 from davebx/docker Enable dockerized toolshed tests. Compare: https://github.com/galaxyproject/galaxy/compare/625d49e2de07...2dcb92aa0e83