- galaxy-commits - lists.galaxyproject.org

[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

[galaxyproject/infrastructure-playbook] 6094b4: Connecting all the things.
by GitHub 13 Apr '16

13 Apr '16

Branch: refs/heads/stats_role Home: https://github.com/galaxyproject/infrastructure-playbook Commit: 6094b47bdc5785c8be93c7af38f36741f3d65314 https://github.com/galaxyproject/infrastructure-playbook/commit/6094b47bdc5… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M roles/stats/templates/grafana.conf.j2 M roles/stats/templates/telegraf.conf.j2 Log Message: ----------- Connecting all the things.

1 0

[galaxyproject/galaxy] 295859: This should fix bug #1892 in toolshed
by GitHub 13 Apr '16

13 Apr '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 295859968413f4c01c0f2bb401040bd92f3e833a https://github.com/galaxyproject/galaxy/commit/295859968413f4c01c0f2bb40104… Author: nturaga <nitesh.turaga(a)gmail.com> Date: 2016-04-12 (Tue, 12 Apr 2016) Changed paths: M templates/webapps/tool_shed/repository/view_changeset.mako Log Message: ----------- This should fix bug #1892 in toolshed Commit: 90d21d6353d49bdbda4eed449f8374bd0ea92851 https://github.com/galaxyproject/galaxy/commit/90d21d6353d49bdbda4eed449f83… Author: nturaga <nitesh.turaga(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M client/galaxy/style/less/base.less M static/style/blue/base.css M templates/webapps/tool_shed/repository/view_changeset.mako Log Message: ----------- Added class linewrap base.less file Commit: 2c81a648a767f6b03df12d37182be03a3b02c3eb https://github.com/galaxyproject/galaxy/commit/2c81a648a767f6b03df12d37182b… Author: nturaga <nitesh.turaga(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M client/galaxy/style/less/base.less M static/style/blue/base.css M templates/webapps/tool_shed/repository/view_changeset.mako Log Message: ----------- changed class name Commit: d7353d381987df3c1b2364fd74ded5134d1415fc https://github.com/galaxyproject/galaxy/commit/d7353d381987df3c1b2364fd74de… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M client/galaxy/style/less/base.less M static/style/blue/base.css M templates/webapps/tool_shed/repository/view_changeset.mako Log Message: ----------- Merge pull request #2142 from nturaga/fix_1892_toolshed_commit_linebreaks This should fix bug #1892 in toolshed Compare: https://github.com/galaxyproject/galaxy/compare/4797f811a4ef...d7353d381987

1 0

[galaxyproject/galaxy] e5ce5d: try pushing again when we get unexpected exception...
by GitHub 13 Apr '16

13 Apr '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: e5ce5dfe33d8a061ed3013be644a2611da4e0f72 https://github.com/galaxyproject/galaxy/commit/e5ce5dfe33d8a061ed3013be644a… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M test/shed_functional/base/twilltestcase.py Log Message: ----------- try pushing again when we get unexpected exception... Commit: cd1e1f5e3ef0ffd600a1ad1f26e4026c7fe809da https://github.com/galaxyproject/galaxy/commit/cd1e1f5e3ef0ffd600a1ad1f26e4… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M test/shed_functional/base/twilltestcase.py Log Message: ----------- remove unwanted check Commit: 3dc46809c41b89fa39924427a27f81d3c7e44632 https://github.com/galaxyproject/galaxy/commit/3dc46809c41b89fa39924427a27f… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M test/shed_functional/base/twilltestcase.py Log Message: ----------- remove unused import Commit: 26a4c137cecbac357a90ed2811268b55a479c35b https://github.com/galaxyproject/galaxy/commit/26a4c137cecbac357a90ed281126… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-04-12 (Tue, 12 Apr 2016) Changed paths: M test/shed_functional/base/twilltestcase.py Log Message: ----------- improve on refactoring of the test Commit: 4797f811a4ef94c846be8b79334f3b20ccfb8109 https://github.com/galaxyproject/galaxy/commit/4797f811a4ef94c846be8b79334f… Author: Nicola Soranzo <nsoranzo(a)tiscali.it> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: M test/shed_functional/base/twilltestcase.py Log Message: ----------- Merge pull request #2130 from martenson/try-fix-pushcheck try pushing again when we get unexpected exception... Compare: https://github.com/galaxyproject/galaxy/compare/408827e251f9...4797f811a4ef

1 0

[galaxyproject/infrastructure-playbook] c978f4: Update nginx confs, remove graphite subdomain. i...
by GitHub 13 Apr '16

13 Apr '16

Branch: refs/heads/stats_role Home: https://github.com/galaxyproject/infrastructure-playbook Commit: c978f4625c72f5b95b898d84d6bf76a71b86a12e https://github.com/galaxyproject/infrastructure-playbook/commit/c978f4625c7… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-04-13 (Wed, 13 Apr 2016) Changed paths: R taccenv/templates/nginx/graphite.j2 M taccenv/templates/nginx/sentry.j2 M taccenv/templates/nginx/stats.j2 Log Message: ----------- Update nginx confs, remove graphite subdomain. is interesting in nginx, it always returns the first server (which was sentry), and http://stats.galaxyproject.org was redirecting to https://sentry.* before this change.

1 0

[galaxyproject/infrastructure-playbook] d0bf01: Configure default user, add vault.
by GitHub 12 Apr '16

12 Apr '16

Branch: refs/heads/stats_role Home: https://github.com/galaxyproject/infrastructure-playbook Commit: d0bf01aa82c6eedbaadd94720a2ac78ab766cd7d https://github.com/galaxyproject/infrastructure-playbook/commit/d0bf01aa82c… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-04-12 (Tue, 12 Apr 2016) Changed paths: M roles/stats/templates/grafana.conf.j2 M taccenv/playbook.yml A taccenv/secret_group_vars/stats.yml Log Message: ----------- Configure default user, add vault.

1 0

[galaxyproject/galaxy]
by GitHub 12 Apr '16

12 Apr '16

Branch: refs/heads/revert-2139-fix-inactivity Home: https://github.com/galaxyproject/galaxy

1 0

[galaxyproject/galaxy] b0ac29: Revert "[16.01] load options from config, not from...
by GitHub 12 Apr '16

12 Apr '16

Branch: refs/heads/revert-2139-fix-inactivity Home: https://github.com/galaxyproject/galaxy Commit: b0ac297536681545637bf5c7a0084a0af907a40b https://github.com/galaxyproject/galaxy/commit/b0ac297536681545637bf5c7a008… 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: ----------- Revert "[16.01] load options from config, not from options"

1 0

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

12 Apr '16

Branch: refs/heads/release_16.01 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 Compare: https://github.com/galaxyproject/galaxy/compare/fe4afefc42a4...ad952a4b8d75

1 0