April 2016 - galaxy-commits - lists.galaxyproject.org

[galaxyproject/galaxy] b93b62: Place $headers before integrity_check
by GitHub 14 Apr '16

14 Apr '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: b93b62ae778905518a5c0d7703cc3e93f2c2ba02 https://github.com/galaxyproject/galaxy/commit/b93b62ae778905518a5c0d7703cc… Author: Marius van den Beek <m.vandenbeek(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh Log Message: ----------- Place $headers before integrity_check PBS needs the resource selection (which will be filled in using $headers) to appear before anything else (except the shebang), so this changes the order. Commit: e81448c62ab5f78d1519826cc7567aa24b476d82 https://github.com/galaxyproject/galaxy/commit/e81448c62ab5f78d1519826cc756… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh Log Message: ----------- Merge pull request #2146 from mvdbeek/reorder_job_template Place $headers before integrity_check Compare: https://github.com/galaxyproject/galaxy/compare/a919e98be3ee...e81448c62ab5

1 0

[galaxyproject/usegalaxy-playbook] dce66f: Switch Main to use CVMFS (still needs /galaxy/main...
by GitHub 14 Apr '16

14 Apr '16

Branch: refs/heads/master Home: https://github.com/galaxyproject/usegalaxy-playbook Commit: dce66f43ebeae399357065686671d4f17d2c7242 https://github.com/galaxyproject/usegalaxy-playbook/commit/dce66f43ebeae399… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: A files/ssl/usegalaxy.org_cert.pem A files/ssl/wildcard_cert.pem A galaxy.yml M galaxy_configs.yml M galaxy_infrastructure.yml R galaxy_main.yml M galaxy_static.yml R galaxy_test.yml M production/group_vars/all.yml M production/group_vars/galaxyservers.yml M production/group_vars/pulsarservers.yml M production/secret_vars/galaxyservers.yml M roles/galaxyprojectdotorg.nginx/README.md M roles/galaxyprojectdotorg.nginx/defaults/main.yml M roles/galaxyprojectdotorg.nginx/handlers/main.yml A roles/galaxyprojectdotorg.nginx/meta/.galaxy_install_info M roles/galaxyprojectdotorg.nginx/meta/main.yml M roles/galaxyprojectdotorg.nginx/tasks/apt.yml M roles/galaxyprojectdotorg.nginx/tasks/main.yml A roles/galaxyprojectdotorg.nginx/tasks/yum.yml A roles/galaxyprojectdotorg.nginx/templates/epel-nginx.conf.j2 A roles/galaxyprojectdotorg.nginx/templates/supervisord.conf.j2 M stage/group_vars/all.yml M stage/group_vars/galaxyservers.yml M stage/secret_vars/galaxyservers.yml M templates/galaxy/usegalaxy.org/config/job_conf.xml.j2 A templates/nginx/galaxy_bx.j2 A templates/nginx/galaxy_main_installer.j2 A templates/nginx/galaxy_test.j2 A templates/nginx/usegalaxy.j2 A templates/nginx/usegalaxy_rewrites.conf.j2 M templates/supervisor/galaxy_impersonate.j2 Log Message: ----------- Switch Main to use CVMFS (still needs /galaxy/main symlinks for shed_tools, migrated_tools, and deps), and also move all of the nginx handling here from the private playbook. And use the updated nginx role to install "Galaxy nginx", which is basically an updated and recompiled (with Starforge!) version of EPEL nginx.

1 0

[galaxyproject/galaxy] 2ebe94: load options from config, not from options
by GitHub 14 Apr '16

14 Apr '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 2ebe9405106dfc16504e3b6f775425634bb4691f https://github.com/galaxyproject/galaxy/commit/2ebe9405106dfc16504e3b6f7754… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-12 (Tue, 12 Apr 2016) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- load options from config, not from options Commit: ad952a4b8d7501d0df48e44d7c966ff22f9a63c4 https://github.com/galaxyproject/galaxy/commit/ad952a4b8d7501d0df48e44d7c96… Author: carlfeberhard <carlfeberhard(a)users.noreply.github.com> Date: 2016-04-12 (Tue, 12 Apr 2016) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- Merge pull request #2139 from martenson/fix-inactivity [16.01] load options from config, not from options Commit: 1e3b3a15581ecd62e78999f6be9e74d9e7cfbc65 https://github.com/galaxyproject/galaxy/commit/1e3b3a15581ecd62e78999f6be9e… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-12 (Tue, 12 Apr 2016) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- fix the value passed to Masthead as options were options.config before Commit: 87dbfeeabd03d4b7f7c81b3e9dfadf3890f71b95 https://github.com/galaxyproject/galaxy/commit/87dbfeeabd03d4b7f7c81b3e9dfa… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- Merge branch 'release_16.01' into release_16.04 Conflicts: static/scripts/bundled/analysis.bundled.js static/scripts/bundled/analysis.bundled.js.map static/scripts/bundled/libs.bundled.js static/scripts/bundled/libs.bundled.js.map Commit: 4c2bca51171efff42e2852bfa59a91d5acee3e73 https://github.com/galaxyproject/galaxy/commit/4c2bca51171efff42e2852bfa59a… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- Merge pull request #2141 from martenson/fix-sideeffect [16.01] fix the value passed to Masthead as options were options.config before Commit: 090e0d33561702b85c82c1bfb228b699c30804ea https://github.com/galaxyproject/galaxy/commit/090e0d33561702b85c82c1bfb228… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Log Message: ----------- Merge branch 'release_16.01' into merge01to04 Commit: d5cc3571704d5fe3927d070456f5b934e9f5e1cf https://github.com/galaxyproject/galaxy/commit/d5cc3571704d5fe3927d070456f5… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- Merge pull request #2150 from martenson/merge01to04 [16.04] Merge 16.01 to 16.04 Commit: 82e9ce827c9c76b242e52747b7d2d1a546e683a6 https://github.com/galaxyproject/galaxy/commit/82e9ce827c9c76b242e52747b7d2… Author: guerler <aysam.guerler(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M lib/galaxy/tools/parameters/__init__.py Log Message: ----------- Add tool parameters back to parameters Commit: ac141397148c0698a06d7d8d2088d94d00961915 https://github.com/galaxyproject/galaxy/commit/ac141397148c0698a06d7d8d2088… Author: guerler <aysam.guerler(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M lib/galaxy/tools/parameters/__init__.py Log Message: ----------- Add blank line Commit: a889e19af7b5a6b87881a4ade1dad4efae168858 https://github.com/galaxyproject/galaxy/commit/a889e19af7b5a6b87881a4ade1da… Author: guerler <aysam.guerler(a)gmail.com> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M lib/galaxy/tools/wrappers.py Log Message: ----------- Fix parameter wrapping Commit: 5be5ba753165da5fa1e2cd7c9c1efbed91f79786 https://github.com/galaxyproject/galaxy/commit/5be5ba753165da5fa1e2cd7c9c1e… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M lib/galaxy/tools/wrappers.py Log Message: ----------- Merge pull request #2161 from guerler/fix_wrapper_issue_001 [16.04] Fix wrapper issue, overload __ne__ Commit: 9bb5978d53070363cc83e1f7bf2a1df5f73eaf41 https://github.com/galaxyproject/galaxy/commit/9bb5978d53070363cc83e1f7bf2a… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M lib/galaxy/tools/parameters/__init__.py Log Message: ----------- Merge pull request #2156 from guerler/fix_data_001 [16.04] Add tool parameters back to parameters and expose for certain tools Commit: 84ef4fd99f602c34ad7de6868864f4d8777ebe23 https://github.com/galaxyproject/galaxy/commit/84ef4fd99f602c34ad7de6868864… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M lib/galaxy/dependencies/pinned-requirements.txt Log Message: ----------- Update pulsar-galaxy-lib in pinned-requirements.txt (it was already updated in requirements.txt). Commit: f013cf2021ec65893dd16bf193bc30182b945047 https://github.com/galaxyproject/galaxy/commit/f013cf2021ec65893dd16bf193bc… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M lib/galaxy/dependencies/pinned-requirements.txt Log Message: ----------- Merge pull request #2164 from natefoo/release_16.04 [16.04] Fix missing pulsar-galaxy-lib update Commit: a919e98be3ee7a8e289b66efb35c508441f5e7b8 https://github.com/galaxyproject/galaxy/commit/a919e98be3ee7a8e289b66efb35c… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M client/galaxy/scripts/layout/page.js M lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/tools/parameters/__init__.py M lib/galaxy/tools/wrappers.py M static/maps/layout/page.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- Merge branch 'release_16.04' into dev Compare: https://github.com/galaxyproject/galaxy/compare/148d4ee88d29...a919e98be3ee

1 0

[galaxyproject/galaxy] 3c97d3: Use "$NCPUS" if defined to set GALAXY_SLOTS
by GitHub 14 Apr '16

14 Apr '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 3c97d30cd6b4f11270fc1e057f236f420542cfea https://github.com/galaxyproject/galaxy/commit/3c97d30cd6b4f11270fc1e057f23… Author: Marius van den Beek <m.vandenbeek(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh Log Message: ----------- Use "$NCPUS" if defined to set GALAXY_SLOTS On our PBS cluster we do not have $PBS_NCPUS, and $PBS_NODEFILE contains the hostname of the nodes the task runs on. But we do have "$NCPUS" with the correct number of CPUS. Commit: 148d4ee88d2982dd5784ec6f1199fa795beaef5d https://github.com/galaxyproject/galaxy/commit/148d4ee88d2982dd5784ec6f1199… Author: Nicola Soranzo <nsoranzo(a)tiscali.it> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh Log Message: ----------- Merge pull request #2145 from mvdbeek/pbs_ncpu Use "$NCPUS" if defined to set GALAXY_SLOTS Compare: https://github.com/galaxyproject/galaxy/compare/87e2a6cd5753...148d4ee88d29

1 0

[galaxyproject/galaxy] 84ef4f: Update pulsar-galaxy-lib in pinned-requirements.tx...
by GitHub 14 Apr '16

14 Apr '16

Branch: refs/heads/release_16.04 Home: https://github.com/galaxyproject/galaxy Commit: 84ef4fd99f602c34ad7de6868864f4d8777ebe23 https://github.com/galaxyproject/galaxy/commit/84ef4fd99f602c34ad7de6868864… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M lib/galaxy/dependencies/pinned-requirements.txt Log Message: ----------- Update pulsar-galaxy-lib in pinned-requirements.txt (it was already updated in requirements.txt). Commit: f013cf2021ec65893dd16bf193bc30182b945047 https://github.com/galaxyproject/galaxy/commit/f013cf2021ec65893dd16bf193bc… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M lib/galaxy/dependencies/pinned-requirements.txt Log Message: ----------- Merge pull request #2164 from natefoo/release_16.04 [16.04] Fix missing pulsar-galaxy-lib update Compare: https://github.com/galaxyproject/galaxy/compare/9bb5978d5307...f013cf2021ec

1 0

[galaxyproject/galaxy] 82e9ce: Add tool parameters back to parameters
by GitHub 14 Apr '16

14 Apr '16

Branch: refs/heads/release_16.04 Home: https://github.com/galaxyproject/galaxy Commit: 82e9ce827c9c76b242e52747b7d2d1a546e683a6 https://github.com/galaxyproject/galaxy/commit/82e9ce827c9c76b242e52747b7d2… Author: guerler <aysam.guerler(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M lib/galaxy/tools/parameters/__init__.py Log Message: ----------- Add tool parameters back to parameters Commit: ac141397148c0698a06d7d8d2088d94d00961915 https://github.com/galaxyproject/galaxy/commit/ac141397148c0698a06d7d8d2088… Author: guerler <aysam.guerler(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M lib/galaxy/tools/parameters/__init__.py Log Message: ----------- Add blank line Commit: 9bb5978d53070363cc83e1f7bf2a1df5f73eaf41 https://github.com/galaxyproject/galaxy/commit/9bb5978d53070363cc83e1f7bf2a… Author: Nate Coraor <nate(a)bx.psu.edu> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M lib/galaxy/tools/parameters/__init__.py Log Message: ----------- Merge pull request #2156 from guerler/fix_data_001 [16.04] Add tool parameters back to parameters and expose for certain tools Compare: https://github.com/galaxyproject/galaxy/compare/5be5ba753165...9bb5978d5307

1 0

[galaxyproject/galaxy] 024ae7: bail earlier if no SMTP server is configured
by GitHub 14 Apr '16

14 Apr '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 024ae7a28665950a6d5c194edc0a3b94110684c2 https://github.com/galaxyproject/galaxy/commit/024ae7a28665950a6d5c194edc0a… Author: Eric Rasche <rasche.eric(a)gmail.com> Date: 2016-04-12 (Tue, 12 Apr 2016) Changed paths: M lib/galaxy/util/__init__.py Log Message: ----------- bail earlier if no SMTP server is configured Commit: e9823573e3121bce86740c9ee91d0e049c01820c https://github.com/galaxyproject/galaxy/commit/e9823573e3121bce86740c9ee91d… Author: Eric Rasche <rasche.eric(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M lib/galaxy/tools/errors.py M lib/galaxy/util/__init__.py Log Message: ----------- Add HTML Template Commit: c2cff25826e36982b8496e9c50a1c370d427ec81 https://github.com/galaxyproject/galaxy/commit/c2cff25826e36982b8496e9c50a1… Author: Eric Rasche <rasche.eric(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M lib/galaxy/tools/errors.py Log Message: ----------- Use CGI for escaping Commit: 5923a67301e966142cd535659ad0e64cf0ada219 https://github.com/galaxyproject/galaxy/commit/5923a67301e966142cd535659ad0… Author: Eric Rasche <rasche.eric(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M lib/galaxy/tools/errors.py Log Message: ----------- Fix sanitization completely Commit: a6d95d090981d414d8efc76056ec1d45faf2e0dd https://github.com/galaxyproject/galaxy/commit/a6d95d090981d414d8efc76056ec… Author: Eric Rasche <rasche.eric(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M lib/galaxy/util/__init__.py Log Message: ----------- Fix flake8 by reverting a previous commit Commit: df481dabe092ff49e97619138e111d57eafb871b https://github.com/galaxyproject/galaxy/commit/df481dabe092ff49e97619138e11… Author: Eric Rasche <rasche.eric(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M lib/galaxy/tools/errors.py Log Message: ----------- Remove unused import Commit: cba10c812b7c9e3979a57bc0b7ece42333e3f364 https://github.com/galaxyproject/galaxy/commit/cba10c812b7c9e3979a57bc0b7ec… Author: Eric Rasche <rasche.eric(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M lib/galaxy/util/__init__.py Log Message: ----------- Fix nitpick Commit: a3e925cc1bea692ba76a5efbc38d2a163c80ffea https://github.com/galaxyproject/galaxy/commit/a3e925cc1bea692ba76a5efbc38d… Author: Eric Rasche <rasche.eric(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M lib/galaxy/util/__init__.py Log Message: ----------- Fix second nitpick Commit: 4d729ff8906cc371102f711a947af61252e51183 https://github.com/galaxyproject/galaxy/commit/4d729ff8906cc371102f711a947a… Author: Eric Rasche <rasche.eric(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M lib/galaxy/util/__init__.py Log Message: ----------- Typo Commit: 6ce9bd82203895226807231158a33b4ec67ff20b https://github.com/galaxyproject/galaxy/commit/6ce9bd82203895226807231158a3… Author: Eric Rasche <rasche.eric(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M lib/galaxy/tools/errors.py Log Message: ----------- Minor touch up for consistency Commit: dd05f0ab24b72fd3c387c6294993aceb38f7d441 https://github.com/galaxyproject/galaxy/commit/dd05f0ab24b72fd3c387c6294993… Author: Eric Rasche <rasche.eric(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M lib/galaxy/tools/errors.py Log Message: ----------- Escape everything Commit: 3d5663e97f9ec5ddae4e1e50eb2405ed82791b7c https://github.com/galaxyproject/galaxy/commit/3d5663e97f9ec5ddae4e1e50eb24… Author: Eric Rasche <rasche.eric(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M lib/galaxy/tools/errors.py Log Message: ----------- Remove double escaping Commit: 87e2a6cd5753adb7f1895e5ad3be94e61e278e04 https://github.com/galaxyproject/galaxy/commit/87e2a6cd5753adb7f1895e5ad3be… Author: Nicola Soranzo <nsoranzo(a)tiscali.it> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M lib/galaxy/tools/errors.py M lib/galaxy/util/__init__.py Log Message: ----------- Merge pull request #2143 from erasche/nicer-emails Nicer bug report emails Compare: https://github.com/galaxyproject/galaxy/compare/d7353d381987...87e2a6cd5753

1 0

[galaxyproject/galaxy] f85aaa: port of middleware fix for TS (#2106)
by GitHub 14 Apr '16

14 Apr '16

Branch: refs/heads/release_16.01 Home: https://github.com/galaxyproject/galaxy Commit: f85aaa4a27a1067a108c05fd1f74fa6060aa4565 https://github.com/galaxyproject/galaxy/commit/f85aaa4a27a1067a108c05fd1f74… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M lib/galaxy/webapps/tool_shed/buildapp.py Log Message: ----------- port of middleware fix for TS (#2106) Commit: c0d65092fbbd1ad7380a0b17d3d9a949145d6170 https://github.com/galaxyproject/galaxy/commit/c0d65092fbbd1ad7380a0b17d3d9… Author: Nicola Soranzo <nsoranzo(a)tiscali.it> Date: 2016-04-14 (Thu, 14 Apr 2016) Changed paths: M lib/galaxy/webapps/tool_shed/buildapp.py Log Message: ----------- Merge pull request #2154 from martenson/port-middleware-fix [16.01] Port middleware fix Compare: https://github.com/galaxyproject/galaxy/compare/4c2bca51171e...c0d65092fbbd

1 0

[galaxyproject/galaxy] 2ebe94: load options from config, not from options
by GitHub 13 Apr '16

13 Apr '16

Branch: refs/heads/release_16.04 Home: https://github.com/galaxyproject/galaxy Commit: 2ebe9405106dfc16504e3b6f775425634bb4691f https://github.com/galaxyproject/galaxy/commit/2ebe9405106dfc16504e3b6f7754… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-12 (Tue, 12 Apr 2016) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- load options from config, not from options Commit: ad952a4b8d7501d0df48e44d7c966ff22f9a63c4 https://github.com/galaxyproject/galaxy/commit/ad952a4b8d7501d0df48e44d7c96… Author: carlfeberhard <carlfeberhard(a)users.noreply.github.com> Date: 2016-04-12 (Tue, 12 Apr 2016) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- Merge pull request #2139 from martenson/fix-inactivity [16.01] load options from config, not from options Commit: 1e3b3a15581ecd62e78999f6be9e74d9e7cfbc65 https://github.com/galaxyproject/galaxy/commit/1e3b3a15581ecd62e78999f6be9e… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-12 (Tue, 12 Apr 2016) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- fix the value passed to Masthead as options were options.config before Commit: 87dbfeeabd03d4b7f7c81b3e9dfadf3890f71b95 https://github.com/galaxyproject/galaxy/commit/87dbfeeabd03d4b7f7c81b3e9dfa… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- Merge branch 'release_16.01' into release_16.04 Conflicts: static/scripts/bundled/analysis.bundled.js static/scripts/bundled/analysis.bundled.js.map static/scripts/bundled/libs.bundled.js static/scripts/bundled/libs.bundled.js.map Commit: 4c2bca51171efff42e2852bfa59a91d5acee3e73 https://github.com/galaxyproject/galaxy/commit/4c2bca51171efff42e2852bfa59a… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- Merge pull request #2141 from martenson/fix-sideeffect [16.01] fix the value passed to Masthead as options were options.config before Commit: 090e0d33561702b85c82c1bfb228b699c30804ea https://github.com/galaxyproject/galaxy/commit/090e0d33561702b85c82c1bfb228… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Log Message: ----------- Merge branch 'release_16.01' into merge01to04 Commit: d5cc3571704d5fe3927d070456f5b934e9f5e1cf https://github.com/galaxyproject/galaxy/commit/d5cc3571704d5fe3927d070456f5… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- Merge pull request #2150 from martenson/merge01to04 [16.04] Merge 16.01 to 16.04 Compare: https://github.com/galaxyproject/galaxy/compare/f03c0375566a...d5cc3571704d

1 0

[galaxyproject/galaxy] 1e3b3a: fix the value passed to Masthead as options were o...
by GitHub 13 Apr '16

13 Apr '16

Branch: refs/heads/release_16.01 Home: https://github.com/galaxyproject/galaxy Commit: 1e3b3a15581ecd62e78999f6be9e74d9e7cfbc65 https://github.com/galaxyproject/galaxy/commit/1e3b3a15581ecd62e78999f6be9e… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-12 (Tue, 12 Apr 2016) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- fix the value passed to Masthead as options were options.config before Commit: 4c2bca51171efff42e2852bfa59a91d5acee3e73 https://github.com/galaxyproject/galaxy/commit/4c2bca51171efff42e2852bfa59a… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- Merge pull request #2141 from martenson/fix-sideeffect [16.01] fix the value passed to Masthead as options were options.config before Compare: https://github.com/galaxyproject/galaxy/compare/ad952a4b8d75...4c2bca51171e

1 0