Branch: refs/heads/release_16.04 Home: https://github.com/galaxyproject/galaxy Commit: edca79a0cf4d0e6afceb0f3b3894b6b3a169bd53 https://github.com/galaxyproject/galaxy/commit/edca79a0cf4d0e6afceb0f3b3894b... Author: Daniel Blankenberg <dan.blankenberg@gmail.com> Date: 2016-06-06 (Mon, 06 Jun 2016) Changed paths: M lib/galaxy/web/security/__init__.py M lib/galaxy/webapps/galaxy/api/tools.py Log Message: ----------- Do not encode dict items that start with 'metadata_' in return value of api/tools/create. Resolves #2423, #2137, and https://github.com/galaxyproject/tools-iuc/pull/770. However, this whole act of encoding by key.endswith('_id') is very messy. Commit: 42739c88c80d10742add92f2e3978ed65a295188 https://github.com/galaxyproject/galaxy/commit/42739c88c80d10742add92f2e3978... Author: Daniel Blankenberg <dan.blankenberg@gmail.com> Date: 2016-06-07 (Tue, 07 Jun 2016) Changed paths: A test-data/biom1_metadata_test.txt A test-data/input_taxonomy.biom1 A test/functional/tools/metadata_biom1.xml M test/functional/tools/sample_datatypes_conf.xml M test/functional/tools/samples_tool_conf.xml Log Message: ----------- Add test for failing handling of BIOM1 metadata. Commit: 10a3f23de2f8d728780b7c1615e7d4c9afeaeeb2 https://github.com/galaxyproject/galaxy/commit/10a3f23de2f8d728780b7c1615e7d... Author: John Chilton <jmchilton@gmail.com> Date: 2016-06-07 (Tue, 07 Jun 2016) Changed paths: M lib/galaxy/web/security/__init__.py M lib/galaxy/webapps/galaxy/api/tools.py A test-data/biom1_metadata_test.txt A test-data/input_taxonomy.biom1 A test/functional/tools/metadata_biom1.xml M test/functional/tools/sample_datatypes_conf.xml M test/functional/tools/samples_tool_conf.xml Log Message: ----------- Merge pull request #2459 from blankenberg/metadata-id-fix [16.04] Do not encode dict items that start with 'metadata_' in return value of api/tools/create. Compare: https://github.com/galaxyproject/galaxy/compare/37a491599257...10a3f23de2f8