Branch: refs/heads/release_18.05 Home: https://github.com/galaxyproject/galaxy Commit: 50f9ca82ba158736e7ed735e3d949a65127a5111 https://github.com/galaxyproject/galaxy/commit/50f9ca82ba158736e7ed735e3d949... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-19 (Thu, 19 Apr 2018) Changed paths: M lib/galaxy/containers/__init__.py M lib/galaxy/visualization/plugins/interactive_environments.py M lib/galaxy/web/proxy/__init__.py M lib/galaxy/webapps/galaxy/controllers/interactive_environments.py Log Message: ----------- Don't attempt to determine ports at GIE container launch time if they fail to be determined on the first attempt. They'll be determined by the readiness check instead. Commit: a7a4e12e79a91a2a17fa86d65077233f8cfcb35c https://github.com/galaxyproject/galaxy/commit/a7a4e12e79a91a2a17fa86d650772... Author: John Chilton <jmchilton@gmail.com> Date: 2018-04-26 (Thu, 26 Apr 2018) Changed paths: M lib/galaxy/model/__init__.py Log Message: ----------- Fix collection element count getting lost during collection copies. Commit: a29770ca554b5aaf8ea6533ee413fed77042a0ea https://github.com/galaxyproject/galaxy/commit/a29770ca554b5aaf8ea6533ee413f... Author: John Chilton <jmchilton@gmail.com> Date: 2018-04-27 (Fri, 27 Apr 2018) Changed paths: M scripts/common_startup.sh Log Message: ----------- Pin the version of node we use in CI, etc.... Our dependencies won't resolve under node 10 currently (because of upath at least https://github.com/anodynos/upath/blob/master/package.json#L43 but maybe other packages as well). Commit: c7b426089aa7ec0e0ba874e03ed9dad60a9d1909 https://github.com/galaxyproject/galaxy/commit/c7b426089aa7ec0e0ba874e03ed9d... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-04-27 (Fri, 27 Apr 2018) Changed paths: M scripts/common_startup.sh Log Message: ----------- Merge pull request #6000 from jmchilton/fix_build_maybe [18.01] Backport #5972 Commit: 9da13d2d3d3a444e9cd45880496c883b30b475b0 https://github.com/galaxyproject/galaxy/commit/9da13d2d3d3a444e9cd45880496c8... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2018-04-27 (Fri, 27 Apr 2018) Changed paths: M lib/galaxy/model/__init__.py Log Message: ----------- Merge pull request #5990 from jmchilton/collection_count_fix [18.01] Fix collection element count getting lost during collection copies. Commit: 26ab5388ba31de646d365fbc8528a86b7dc7949a https://github.com/galaxyproject/galaxy/commit/26ab5388ba31de646d365fbc8528a... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-04-27 (Fri, 27 Apr 2018) Changed paths: M lib/galaxy/containers/__init__.py M lib/galaxy/visualization/plugins/interactive_environments.py M lib/galaxy/web/proxy/__init__.py M lib/galaxy/webapps/galaxy/controllers/interactive_environments.py Log Message: ----------- Merge pull request #5930 from natefoo/gie-late-ports [18.01] Only try to determine GIE container ports once at launch, then hand off to readiness check Commit: bd63c04c2e1988e838a033830f60e1ad6c2d9bf7 https://github.com/galaxyproject/galaxy/commit/bd63c04c2e1988e838a033830f60e... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-04-27 (Fri, 27 Apr 2018) Changed paths: M lib/galaxy/containers/__init__.py M lib/galaxy/model/__init__.py M lib/galaxy/visualization/plugins/interactive_environments.py M lib/galaxy/web/proxy/__init__.py M lib/galaxy/webapps/galaxy/controllers/interactive_environments.py Log Message: ----------- Merge remote-tracking branch 'origin/release_18.01' into release_18.05 Compare: https://github.com/galaxyproject/galaxy/compare/e3331817283b...bd63c04c2e19