Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 2f9f0211f954067f40a9e8521d62093754585e83 https://github.com/galaxyproject/galaxy/commit/2f9f0211f954067f40a9e8521d620... Author: John Chilton <jmchilton@gmail.com> Date: 2017-10-06 (Fri, 06 Oct 2017) Changed paths: M test/integration/test_upload_configuration_options.py Log Message: ----------- Tests for blocking path pastes and intranet URLs for secondary files... ... during upload. xref #4289 (blocking intranet URLs by default) xref #4404 (implementing path pastes for normal uploads with the file:// prefix). xref #4417 (initial tests for blocking file:// prefixes for non-admins added in #4404) Rebased with a small fix thanks to the ever vigilant @nsoranzo. Commit: c4048d2f80d2d04204997d86716de5b75b1816a4 https://github.com/galaxyproject/galaxy/commit/c4048d2f80d2d04204997d86716de... Author: John Chilton <jmchilton@gmail.com> Date: 2017-10-09 (Mon, 09 Oct 2017) Changed paths: M test/integration/test_upload_configuration_options.py Log Message: ----------- Put more effort into method names in test_upload_configuration_options.py. Per suggestion of @nsoranzo. Commit: 5a4f625eff139f5eac31e3b9260e8bec63d3f513 https://github.com/galaxyproject/galaxy/commit/5a4f625eff139f5eac31e3b9260e8... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2017-10-09 (Mon, 09 Oct 2017) Changed paths: M test/integration/test_upload_configuration_options.py Log Message: ----------- Merge pull request #4762 from jmchilton/blocked_secondary_files_upload_urls Tests for blocking path pastes and intranet URLs for secondary files... Compare: https://github.com/galaxyproject/galaxy/compare/e03bedfb8526...5a4f625eff13