Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: f5082604f7282587bb8385dbdb3bb91905bee87b https://github.com/galaxyproject/galaxy/commit/f5082604f7282587bb8385dbdb3bb... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-01-19 (Thu, 19 Jan 2017) Changed paths: M lib/galaxy/util/object_wrapper.py Log Message: ----------- Do not wrap __class__ attribute of SafeStringWrapper Fix #3353 by not recursing on the parent classes, which may lead to an abstract class. Also fix a method name of "object" class. Commit: c9fdb6e3efd2721dc193ea5f1d5cfe6c014ad94e https://github.com/galaxyproject/galaxy/commit/c9fdb6e3efd2721dc193ea5f1d5cf... Author: John Chilton <jmchilton@gmail.com> Date: 2017-01-19 (Thu, 19 Jan 2017) Changed paths: M lib/galaxy/util/object_wrapper.py Log Message: ----------- Merge pull request #3449 from dannon/backport_mistargeted_3429 [16.10] Backport of 3429, safestringwrapper Commit: 60b57397e7f8227f0a5017141c81fdcc81d59ede https://github.com/galaxyproject/galaxy/commit/60b57397e7f8227f0a5017141c81f... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-01-19 (Thu, 19 Jan 2017) Log Message: ----------- Merge branch 'release_16.10' into dev Compare: https://github.com/galaxyproject/galaxy/compare/b4475ba9df9b...60b57397e7f8