Commit Graph
51146 Commits
Author SHA1 Message Date
Dannon Baker 615c593fa7 Minor cleanup, typo fix while testing.
Dropped a couple prettier-ignores that weren't doing much, but we
can/should certainly continue to use this where the formatting is
egregious.
2021-01-20 20:21:36 -05:00
Mason Houtz 0b09b79a6e reconfigured monitor 2021-01-20 11:58:49 -08:00
Mason 2cd26e662d created global ajax monitor, emits events when matching routes are requested 2021-01-20 11:45:20 -08:00
Nicola Soranzo 779f5827be Merge branch 'release_21.01' into dev 2021-01-20 18:19:50 +00:00
Nicola Soranzo 72c08ccaad Merge branch 'release_20.09' into release_21.01 2021-01-20 18:15:49 +00:00
Dannon a271d2419c Merge pull request #11137 from OlegZharkov/fix_user_dir_import
[20.09] Fix permission in user dir library import
2021-01-20 13:08:21 -05:00
John Chilton 02317fab12 Merge pull request #11167 from davelopez/fastapi-migration-tool_data
FastAPI routes for tool data tables
2021-01-20 12:31:53 -05:00
John Chilton 1e0a1fbffa Merge pull request #11187 from mvdbeek/singularity_pulling_fix
[20.09] Fix pulling of  singularity images if docker cli not available
2021-01-20 12:08:01 -05:00
mvdbeek 2636a28515 Create cache dir if it doesn't exist 2021-01-20 14:36:12 +01:00
mvdbeek 44ef5a4244 Return uncached container description if cached container not available 2021-01-20 13:40:43 +01:00
davelopez c11eca20d6 Move test_delete_entry to integration tests 2021-01-20 13:21:57 +01:00
mvdbeek e428e4298e Fix pulling of singularity images
That broke in https://github.com/galaxyproject/galaxy/pull/11134, since
the singularity container resolve() inherits from docker container
resolution it'd also check to see if `docker` was on path.
2021-01-20 12:06:32 +01:00
davelopez 4cb2f1820c Update test_delete_entry to reduce mutability of config files
Delete the last entry intead of the first one (the original). This should reduce the mutation probability of the server config files.
2021-01-20 11:30:42 +01:00
John Chilton 22aad6e817 Allow execution of tool data deletion test case.
It ultimately needs to be an integration test since it modifies files under git control as is, but it can be hacked around for now to test this functionality.

GALAXY_TEST_INCLUDE_API_CONFIG_MOD_TESTS=1 pytest -s lib/galaxy_test/api/test_tool_data.py::AdminToolDataApiTestCase
2021-01-19 19:30:46 +01:00
John Chilton feab24415b Fix bug where HERE in tool data tables breaks down after reload. 2021-01-19 19:25:16 +01:00
Nicola Soranzo 7ffe71dd84 Merge branch 'release_21.01' into dev 2021-01-19 17:51:43 +00:00
Nicola Soranzo da0d41f0dd Merge branch 'release_20.09' into release_21.01 2021-01-19 17:50:41 +00:00
Dannon ec36d847c7 Merge pull request #11173 from nsoranzo/2fa_gpg
Recommend 2FA and commit signing
2021-01-19 08:06:42 -05:00
Dannon da9f4114a7 Merge pull request #11181 from mvdbeek/history_sync_retries_backport
[21.01] History sync retries backport
2021-01-19 08:06:29 -05:00
davelopez e8d24b0588 Minor doc changes and cleanup 2021-01-19 13:58:21 +01:00
davelopez aef070e00b Add delete endpoint 2021-01-19 13:12:04 +01:00
davelopez 21b3ac19f3 Add delete method to manager 2021-01-19 12:57:24 +01:00
davelopez 712e305dc5 Add tests for delete errors 2021-01-19 12:56:01 +01:00
Marius van den Beek f67dce1a76 Merge pull request #11161 from nuwang/parallelize_server_client_build
Parallelize client and server builds in dockerfile
2021-01-19 12:53:39 +01:00
Mason Houtz 6de1c75774 added store listener to update facade current history model 2021-01-19 12:14:15 +01:00
Mason Houtz 2eb1525098 separated beta toggle features 2021-01-19 12:14:15 +01:00
Mason Houtz 13ff4155a7 made success and error messages a little easier to consume 2021-01-19 12:14:15 +01:00
Mason Houtz b7de280ef3 added retry catch to vuex current history panel syncer for pages with slow current history loads 2021-01-19 12:14:15 +01:00
Marius van den Beek 9b8ab4eb26 Merge pull request #11172 from Nerdinacan/add_current_history_sync_retries
Fixed sync between legacy galaxy variable and Vuex current history
2021-01-19 12:13:34 +01:00
Martin Cech 4def8f9721 Merge pull request #11179 from jmchilton/unused_ts
Remove unused TS methods.
2021-01-19 12:05:49 +01:00
Marius van den Beek 405372d8d3 Merge pull request #11155 from nsoranzo/pep8
Fix all E203, E741 and W504 flake8 errors
2021-01-19 10:49:04 +01:00
John Chilton b3af6948c9 Remove unused methods. 2021-01-18 22:55:38 -05:00
John Chilton b6747dc5c3 Merge pull request #11151 from jmchilton/fix_wf_extract
[21.01] Fix certain classes of workflow extraction on copied objects.
2021-01-18 18:41:18 -05:00
John Chilton 8804837090 Merge pull request #11171 from OlegZharkov/more_markers
[21.01] add more markers for screenshooting
2021-01-18 18:38:44 -05:00
John Chilton a2e20be7ab Merge pull request #11176 from pcm32/patch-9
Warns that build_mulled_singularity requires docker
2021-01-18 18:36:41 -05:00
John Chilton 8a974b8696 Merge pull request #11170 from mvdbeek/fix_history_import_job_finish
[21.01] Fix history import job done before import complete
2021-01-18 17:26:53 -05:00
Pablo Moreno 643b71b585 Warns that build_mulled_singularity requires docker 2021-01-18 22:26:47 +00:00
Mason Houtz 51d2da403d added store listener to update facade current history model 2021-01-18 13:41:37 -08:00
Mason Houtz cbc694c1a1 separated beta toggle features 2021-01-18 13:22:39 -08:00
Nicola Soranzo 137aad47b7 Recommend 2FA and commit signing 2021-01-18 20:57:16 +00:00
Mason Houtz 52089e317f made success and error messages a little easier to consume 2021-01-18 11:57:01 -08:00
Mason Houtz a421250673 added retry catch to vuex current history panel syncer for pages with slow current history loads 2021-01-18 11:37:19 -08:00
Oleg Zharkov 113020463e fix lint 2021-01-18 19:43:02 +01:00
Oleg Zharkov 7c2c0e3bf3 add more markers 2021-01-18 19:41:20 +01:00
John Chilton bcc7ada349 Merge pull request #11169 from mvdbeek/fix_safe_dump
[21.01] Don't use copy when serializing JSON in safe_dumps
2021-01-18 13:14:19 -05:00
mvdbeek 2a1aea4523 Drop workaround that shouldn't be needed
with the previous commit.
2021-01-18 18:05:00 +01:00
davelopez 289ca2b89f Import StructuredApp instead of UniverseApplication 2021-01-18 17:54:09 +01:00
Nicola Soranzo b94f89bcca Merge pull request #11148 from mvdbeek/mule_messaging_fix
[20.09] Fix mule job messaging
2021-01-18 16:42:53 +00:00
mvdbeek 3ea14c05b8 Fix history import job done before import complete
By moving history import from job wrapper cleanup to exec_after_process.
That seems like a better location overall, and in particular runs the
actual import before we set the final job state.
2021-01-18 17:37:02 +01:00
davelopez 1977d2ad95 Address some comments in the review 2021-01-18 17:22:39 +01:00