Branch: refs/heads/release_16.01 Home: https://github.com/galaxyproject/galaxy Commit: cde04ad52d40b5d7b26a0c636d9d24bf6adbdc92 https://github.com/galaxyproject/galaxy/commit/cde04ad52d40b5d7b26a0c636d9d2... Author: Nicola Soranzo nicola.soranzo@tgac.ac.uk Date: 2016-04-12 (Tue, 12 Apr 2016)

Changed paths: M lib/galaxy/web/framework/helpers/grids.py

Log Message: ----------- markupsafe.escape() in Python2 does not work on str containing non-ASCII characters.

Fix #2135.

Commit: 18c00899a30cd162cd0bb3a251a49cff2143d3a3 https://github.com/galaxyproject/galaxy/commit/18c00899a30cd162cd0bb3a251a49... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-04-14 (Thu, 14 Apr 2016)

Changed paths: M lib/galaxy/web/framework/helpers/grids.py

Log Message: ----------- Merge pull request #2138 from nsoranzo/release_16.01_fix_for_2135

[16.01] markupsafe.escape() in Python2 does not work on str containing non-ASCII characters

Compare: https://github.com/galaxyproject/galaxy/compare/68ce6ce49cc8...18c00899a30c