Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: ec22b1d3ecd85cff65d232d0997703ee096d5ce1 https://github.com/galaxyproject/galaxy/commit/ec22b1d3ecd85cff65d232d099770... Author: John Chilton <jmchilton@gmail.com> Date: 2017-04-26 (Wed, 26 Apr 2017) Changed paths: M config/galaxy.ini.sample M lib/galaxy/web/base/interactive_environments.py M lib/galaxy/web/proxy/js/package.json Log Message: ----------- Fixes to get IEs working on Mac OS X. - Fix logic error related to config parsing (OS non-specific). - Don't trust GatewayAddress from Docker if on Mac OS X - it is probably a Docker host VM specific address. - Update sqlite dependency for the newest version of Node available from Mac OS X Homebrew. - Add a little blurb about how to configure galaxy_infrastructure_url in this case. Commit: 910c22b7a1c759a651186f13e6c6707d91becfec https://github.com/galaxyproject/galaxy/commit/910c22b7a1c759a651186f13e6c67... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2017-04-26 (Wed, 26 Apr 2017) Changed paths: M config/galaxy.ini.sample M lib/galaxy/web/base/interactive_environments.py M lib/galaxy/web/proxy/js/package.json Log Message: ----------- Merge pull request #3978 from jmchilton/ie_for_mac_os_x_fixes Fixes to get GIEs working on Mac OS X. Compare: https://github.com/galaxyproject/galaxy/compare/2f518e5ee444...910c22b7a1c7