Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 975c8b605fffb968106ec0d3e04569d8d8c70f44 https://github.com/galaxyproject/galaxy/commit/975c8b605fffb968106ec0d3e0456... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-12-14 (Fri, 14 Dec 2018) Changed paths: M scripts/common_startup.sh M scripts/common_startup_functions.sh Log Message: ----------- Fix activation of ``_galaxy_`` conda env - Use `conda_activate`, which works also under dash - Run `conda_activate` also when `$GALAXY_CONDA_ENV` already exists - Run `virtualenv` when the conda env is active but `$GALAXY_VIRTUAL_ENV` does not exist - Update the default for `GALAXY_CONDA_ENV` in scripts/common_startup_functions.sh Follow-up on https://github.com/galaxyproject/galaxy/pull/6975 . Commit: 9dcb002505a1e2c38604ea8889fef40f41531fdd https://github.com/galaxyproject/galaxy/commit/9dcb002505a1e2c38604ea8889fef... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2018-12-15 (Sat, 15 Dec 2018) Changed paths: M scripts/common_startup.sh M scripts/common_startup_functions.sh Log Message: ----------- Merge pull request #7116 from nsoranzo/followup_on_6975 Fix activation of ``_galaxy_`` conda env Compare: https://github.com/galaxyproject/galaxy/compare/1caf7f4bab42...9dcb002505a1 **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.