Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 9e0d3b69cabe73a7b839e62723e73d52c2c41c69 https://github.com/galaxyproject/galaxy/commit/9e0d3b69cabe73a7b839e62723e73... Author: mvdbeek m.vandenbeek@gmail.com Date: 2019-02-27 (Wed, 27 Feb 2019)

Changed paths: M lib/galaxy/managers/workflows.py

Log Message: ----------- Fix workflow loading on systems with ASCII locale

Fixes https://github.com/galaxyproject/galaxy/issues/7421, though it's very likely Galaxy won't play well when python is falling back to ASCII as default encoding.

WorkflowStep.label is backed by a 255 character unicode string, but tool_inputs is JSONType, which might have integer or float values (in principle), so we play it safe by casting to unicode.

Commit: 13c175a8096b3d17b4002906cf8e13ab01865222 https://github.com/galaxyproject/galaxy/commit/13c175a8096b3d17b4002906cf8e1... Author: Martin Cech marten@bx.psu.edu Date: 2019-02-28 (Thu, 28 Feb 2019)

Changed paths: M lib/galaxy/managers/workflows.py

Log Message: ----------- Merge pull request #7422 from mvdbeek/fix_workflow_loading

[18.09] Fix workflow loading on systems with ASCII locale

Commit: 9a26de1b4b5a96eacab97aca2e74b994f38bdc31 https://github.com/galaxyproject/galaxy/commit/9a26de1b4b5a96eacab97aca2e74b... Author: Nate Coraor nate@bx.psu.edu Date: 2019-02-28 (Thu, 28 Feb 2019)

Changed paths: M lib/galaxy/jobs/runners/slurm.py

Log Message: ----------- Catch another Slurm memory cgroup creation error message

Commit: 68e3568bb25928a86283e3d50411d64acd523c52 https://github.com/galaxyproject/galaxy/commit/68e3568bb25928a86283e3d50411d... Author: Nicola Soranzo nicola.soranzo@gmail.com Date: 2019-03-01 (Fri, 01 Mar 2019)

Changed paths: M lib/galaxy/jobs/runners/slurm.py

Log Message: ----------- Merge pull request #7429 from natefoo/slurm-cgroup-message-fix

[18.09] Catch another Slurm memory cgroup creation error message

Commit: 64a0152a6b82dd28c7fb5cb6a784e7eced988906 https://github.com/galaxyproject/galaxy/commit/64a0152a6b82dd28c7fb5cb6a784e... Author: Nicola Soranzo nicola.soranzo@earlham.ac.uk Date: 2019-03-01 (Fri, 01 Mar 2019)

Changed paths: M lib/galaxy/jobs/runners/slurm.py M lib/galaxy/managers/workflows.py

Log Message: ----------- Merge branch 'release_18.09' into release_19.01

Commit: c671b53727896c199227e33bed67d5a00c05cfd7 https://github.com/galaxyproject/galaxy/commit/c671b53727896c199227e33bed67d... Author: Nicola Soranzo nicola.soranzo@earlham.ac.uk Date: 2019-03-01 (Fri, 01 Mar 2019)

Changed paths: M lib/galaxy/jobs/runners/slurm.py M lib/galaxy/managers/workflows.py

Log Message: ----------- Merge branch 'release_19.01' into dev

Compare: https://github.com/galaxyproject/galaxy/compare/ebec090e46c1...c671b5372789