Branch: refs/heads/release_18.01
Home:
https://github.com/galaxyproject/galaxy
Commit: b6d0b1492110d8758a34f412b881977480dd24ad
https://github.com/galaxyproject/galaxy/commit/b6d0b1492110d8758a34f412b8...
Author: Martin Cech <marten(a)bx.psu.edu>
Date: 2018-01-25 (Thu, 25 Jan 2018)
Changed paths:
M lib/galaxy/model/mapping.py
Log Message:
-----------
Merge pull request #5391 from dannon/release_17.09
[17.09] Constrain workflow tool panel entries to those not deleted.
Commit: 74d57cfc1c0d9d82b6893257438937ba0e37f5af
https://github.com/galaxyproject/galaxy/commit/74d57cfc1c0d9d82b689325743...
Author: mvdbeek <m.vandenbeek(a)gmail.com>
Date: 2018-01-26 (Fri, 26 Jan 2018)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-node.js
Log Message:
-----------
Fix subworkflow creation
This fixes #5396. The problem was that we would override the content_id with an
undefined value. Broken in
https://github.com/galaxyproject/galaxy/pull/5249.
Commit: f589a0cb5b45b5964e654fe7eb1602a13ac1bf57
https://github.com/galaxyproject/galaxy/commit/f589a0cb5b45b5964e654fe7eb...
Author: mvdbeek <m.vandenbeek(a)gmail.com>
Date: 2018-01-26 (Fri, 26 Jan 2018)
Changed paths:
M static/maps/mvc/workflow/workflow-node.js.map
M static/scripts/mvc/workflow/workflow-node.js
Log Message:
-----------
Build client
Commit: d6fb37071dc4b425763c1e1aeb9b8d404cf111a0
https://github.com/galaxyproject/galaxy/commit/d6fb37071dc4b425763c1e1aeb...
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2018-01-26 (Fri, 26 Jan 2018)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-node.js
M static/maps/mvc/workflow/workflow-node.js.map
M static/scripts/mvc/workflow/workflow-node.js
Log Message:
-----------
Merge pull request #5398 from mvdbeek/subworkflow_creation_fix
[17.09] Subworkflow creation fix
Commit: 414c03124785f194bf46e84c95e20219423f4f16
https://github.com/galaxyproject/galaxy/commit/414c03124785f194bf46e84c95...
Author: mvdbeek <m.vandenbeek(a)gmail.com>
Date: 2018-01-29 (Mon, 29 Jan 2018)
Changed paths:
M config/galaxy.ini.sample
M lib/galaxy/tools/deps/resolvers/conda.py
Log Message:
-----------
Follow IUC and Drop r channel from default cond channels
Commit: a70f2875b3b72d3cc50d41ea9120df8c3d03de32
https://github.com/galaxyproject/galaxy/commit/a70f2875b3b72d3cc50d41ea91...
Author: mvdbeek <m.vandenbeek(a)gmail.com>
Date: 2018-01-29 (Mon, 29 Jan 2018)
Changed paths:
M doc/source/admin/dependency_resolvers.rst
M lib/galaxy/tools/deps/mulled/mulled_build.py
Log Message:
-----------
Remove r channel from more locations
Commit: 9fcac13145854abf9445e3b75da3eee42c0d7383
https://github.com/galaxyproject/galaxy/commit/9fcac13145854abf9445e3b75d...
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2018-01-30 (Tue, 30 Jan 2018)
Changed paths:
M lib/galaxy/jobs/actions/post.py
Log Message:
-----------
Fix the PJA type issue when mapping renames over nested lists.
Commit: 8e5d2d3214024d5cabf826c6389b6130dd30fd98
https://github.com/galaxyproject/galaxy/commit/8e5d2d3214024d5cabf826c638...
Author: Marius van den Beek <m.vandenbeek(a)gmail.com>
Date: 2018-01-31 (Wed, 31 Jan 2018)
Changed paths:
M lib/galaxy/jobs/actions/post.py
Log Message:
-----------
Merge pull request #5414 from jmchilton/skip_invalid_pja
[17.09] Fix the PJA type issue when mapping renames over nested lists.
Commit: 34421966d41a9b9491d3388200c3642c8514b9f1
https://github.com/galaxyproject/galaxy/commit/34421966d41a9b9491d3388200...
Author: Björn Grüning <bjoern(a)gruenings.eu>
Date: 2018-01-31 (Wed, 31 Jan 2018)
Changed paths:
M config/galaxy.ini.sample
M doc/source/admin/dependency_resolvers.rst
M lib/galaxy/tools/deps/mulled/mulled_build.py
M lib/galaxy/tools/deps/resolvers/conda.py
Log Message:
-----------
Merge pull request #5406 from mvdbeek/conda_and_channel_order_update
[17.05] Follow IUC and drop r channel from default conda channels
Commit: c0c95548a3c77f361f09857e9d80a04a6b000e23
https://github.com/galaxyproject/galaxy/commit/c0c95548a3c77f361f09857e9d...
Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk>
Date: 2018-01-31 (Wed, 31 Jan 2018)
Changed paths:
M config/galaxy.ini.sample
M doc/source/admin/dependency_resolvers.rst
M lib/galaxy/tools/deps/mulled/mulled_build.py
M lib/galaxy/tools/deps/resolvers/conda.py
Log Message:
-----------
Merge branch 'release_17.05' into release_17.09
Commit: 5b23c0e87d2ed17075e6ba8d529da25f27dae8c8
https://github.com/galaxyproject/galaxy/commit/5b23c0e87d2ed17075e6ba8d52...
Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk>
Date: 2018-01-31 (Wed, 31 Jan 2018)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-node.js
M config/galaxy.yml.sample
M doc/source/admin/dependency_resolvers.rst
M doc/source/admin/galaxy_options.rst
M lib/galaxy/jobs/actions/post.py
M lib/galaxy/tools/deps/mulled/mulled_build.py
M lib/galaxy/tools/deps/resolvers/conda.py
M lib/galaxy/webapps/galaxy/config_schema.yml
Log Message:
-----------
Merge branch 'release_17.09' into release_18.01
Conflicts:
client/galaxy/scripts/mvc/workflow/workflow-node.js
config/galaxy.ini.sample
static/maps/mvc/workflow/workflow-node.js.map
static/scripts/mvc/workflow/workflow-node.js
Compare:
https://github.com/galaxyproject/galaxy/compare/54e07568bef2...5b23c0e87d2e