Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: e8a64a862212af970690fcd1969ac8f5ebaaf407 https://github.com/galaxyproject/galaxy/commit/e8a64a862212af970690fcd1969ac... Author: Mason <nerdinacan@gmail.com> Date: 2018-10-31 (Wed, 31 Oct 2018) Changed paths: A client/galaxy/scripts/apps/sample.test.js A client/galaxy/scripts/unitTestBundle.js A client/karma.config.base.js R client/karma.config.js A client/karma.config.mocha.js A client/karma.config.qunit.js M client/package.json A client/webpack.config.test.js M client/yarn.lock Log Message: ----------- Split qunit and mocha tests, clean up karma configs Commit: 1490b6ae839bd704af45b7a415ba70d7fc013df3 https://github.com/galaxyproject/galaxy/commit/1490b6ae839bd704af45b7a415ba7... Author: Mason <nerdinacan@gmail.com> Date: 2018-10-31 (Wed, 31 Oct 2018) Changed paths: M client/galaxy/style/scss/ui.scss M templates/admin/tool_shed_repository/monitor_repository_installation.mako M templates/webapps/galaxy/admin/manage_dependencies.mako M templates/webapps/galaxy/admin/sanitize_whitelist.mako M templates/webapps/galaxy/admin/view_display_applications.mako Log Message: ----------- Merge branch 'dev' into karma_chromeheadless Commit: b52b2d8c4817295f9dad56a057fe9d5a095d3a37 https://github.com/galaxyproject/galaxy/commit/b52b2d8c4817295f9dad56a057fe9... Author: Mason <nerdinacan@gmail.com> Date: 2018-11-01 (Thu, 01 Nov 2018) Changed paths: M config/datatypes_conf.xml.sample M config/migrated_tools_conf.xml.sample M config/shed_tool_conf.xml.sample M doc/source/admin/tool_panel.rst A lib/galaxy/datatypes/converters/tar_to_directory.xml M lib/galaxy/datatypes/data.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/parameters/grouping.py M lib/galaxy/util/compression_utils.py M lib/galaxy/webapps/galaxy/api/datasets.py M lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/tool_shed/galaxy_install/migrate/check.py M lib/tool_shed/util/common_util.py M templates/webapps/galaxy/admin/tool_sheds.mako M test/api/test_tools.py M test/api/test_tools_upload.py M test/base/populators.py M test/functional/tools/sample_datatypes_conf.xml M test/integration/test_upload_configuration_options.py M tools/data_source/upload.py M tools/data_source/upload.xml Log Message: ----------- Merge branch 'dev' into karma_chromeheadless Commit: 2cc0417530cb33dfa43cb0c0d64f2f807d5396d5 https://github.com/galaxyproject/galaxy/commit/2cc0417530cb33dfa43cb0c0d64f2... Author: Mason <nerdinacan@gmail.com> Date: 2018-11-01 (Thu, 01 Nov 2018) Changed paths: M .travis.yml M client/karma.config.base.js Log Message: ----------- Added chrome to qunit build, tried no sandbox flag on chrome Commit: b637c7575a6cdd17960b57e803cabcaa9fe5972c https://github.com/galaxyproject/galaxy/commit/b637c7575a6cdd17960b57e803cab... Author: Mason <nerdinacan@gmail.com> Date: 2018-11-01 (Thu, 01 Nov 2018) Changed paths: M Makefile M client/karma.config.base.js M client/package.json Log Message: ----------- Modified test script calls Commit: 31d3c97e757fd9e9206c815d7b0c9b9d22d0d7a8 https://github.com/galaxyproject/galaxy/commit/31d3c97e757fd9e9206c815d7b0c9... Author: Mason <nerdinacan@gmail.com> Date: 2018-11-01 (Thu, 01 Nov 2018) Changed paths: M client/karma.config.qunit.js Log Message: ----------- Remove one failing test just to check build Commit: e92ce870928700917d69e9c3d939087d6d48eb56 https://github.com/galaxyproject/galaxy/commit/e92ce870928700917d69e9c3d9390... Author: Mason <nerdinacan@gmail.com> Date: 2018-11-01 (Thu, 01 Nov 2018) Changed paths: M client/galaxy/scripts/qunit/test.js M client/karma.config.qunit.js Log Message: ----------- Removed bad test just to test build Commit: b06957e90619b3b7c4cf1f7b989ae32242b55f83 https://github.com/galaxyproject/galaxy/commit/b06957e90619b3b7c4cf1f7b989ae... Author: Mason <nerdinacan@gmail.com> Date: 2018-11-01 (Thu, 01 Nov 2018) Changed paths: M client/karma.config.mocha.js Log Message: ----------- Added existing mocha tests back Commit: a7a73bcfcd32de2b89a6cd4119ba64db8be045ef https://github.com/galaxyproject/galaxy/commit/a7a73bcfcd32de2b89a6cd4119ba6... Author: Mason <nerdinacan@gmail.com> Date: 2018-11-01 (Thu, 01 Nov 2018) Changed paths: M client/karma.config.base.js M client/karma.config.mocha.js M client/karma.config.qunit.js M client/package.json A client/webpack.config.qunit.js R client/webpack.config.test.js A client/webpack.config.unittest.js M client/yarn.lock Log Message: ----------- Documented differences bretween different webpack configs, used cleaner tool and ignore-loader for true unit-tests Commit: c2f71c3a3ec31fd6af7479db9ae13f8b0975d584 https://github.com/galaxyproject/galaxy/commit/c2f71c3a3ec31fd6af7479db9ae13... Author: Mason <nerdinacan@gmail.com> Date: 2018-11-01 (Thu, 01 Nov 2018) Changed paths: M client/webpack.config.qunit.js Log Message: ----------- Added missing settings on special qunit webpack config Commit: 19b2fdd73ba82d0eb3ae38141134915d8a745827 https://github.com/galaxyproject/galaxy/commit/19b2fdd73ba82d0eb3ae381411349... Author: Mason <nerdinacan@gmail.com> Date: 2018-11-03 (Sat, 03 Nov 2018) Changed paths: R client/galaxy/scripts/apps/sample.test.js A client/galaxy/scripts/sample.test.js R client/karma.config.base.js R client/karma.config.mocha.js R client/karma.config.qunit.js A client/karma/karma.config.base.js A client/karma/karma.config.mocha.js A client/karma/karma.config.qunit.js A client/karma/webpack.config.qunit.js A client/karma/webpack.config.unittest.js M client/package.json R client/webpack.config.qunit.js R client/webpack.config.unittest.js Log Message: ----------- Reorganized config scripts, fleshed out comments and instructions Commit: a53de291fefd34ca9fcdf1a03bacd9739f768edf https://github.com/galaxyproject/galaxy/commit/a53de291fefd34ca9fcdf1a03bacd... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-11-05 (Mon, 05 Nov 2018) Changed paths: M .travis.yml M Makefile M client/galaxy/scripts/qunit/test.js A client/galaxy/scripts/sample.test.js A client/galaxy/scripts/unitTestBundle.js R client/karma.config.js A client/karma/karma.config.base.js A client/karma/karma.config.mocha.js A client/karma/karma.config.qunit.js A client/karma/webpack.config.qunit.js A client/karma/webpack.config.unittest.js M client/package.json M client/yarn.lock Log Message: ----------- Merge pull request #6959 from Nerdinacan/karma_chromeheadless Switch from PhantomJS to Chrome Headless for unit tests Compare: https://github.com/galaxyproject/galaxy/compare/c3dc2392ce1a...a53de291fefd **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.