Commit Graph
76611 Commits
Author SHA1 Message Date
Marius van den Beek fb7d10b221 Merge pull request #18251 from davelopez/24.1_fix_history_export_error_handling
[24.1] Fix history export error handling
2024-05-31 10:01:55 +02:00
Martin Cech 8f4029cdda Merge pull request #18274 from jdavcs/241_result_mappings
[24.1] Fix handler: access to result row items changed in SA2.0
2024-05-30 23:07:35 +02:00
John Davis 534f933861 Fix SA20 bug 2024-05-30 15:19:38 -04:00
John Davis 4dda05fbd3 Merge pull request #18270 from jdavcs/241_merge_24.0
[24.1] Merge 24.0 into 24.1
2024-05-30 11:40:45 -04:00
John Davis 4030c70e9f Merge 24.0 into 24.1
Adjust TS api_keys model
- Boolean datatype dropped since it's inferred from the type hint
- nullable=False added
2024-05-30 11:24:24 -04:00
John Davis 15a8e6cc9a Merge branch 'release_23.2' into release_24.0 2024-05-30 11:11:12 -04:00
John Davis dbd063e00d Merge release_23.1 into release_23.2 2024-05-30 10:57:20 -04:00
Marius van den Beek 90c9d4756f Merge pull request #18267 from jdavcs/231_ts_migration
[23.1] Add missing TS migration
2024-05-30 15:46:20 +02:00
John Davis d0d16ebf49 Make column non-nullable 2024-05-30 09:34:38 -04:00
Nicola Soranzo 6ef6fc911f Merge branch 'release_24.0' into release_24.1 2024-05-30 13:03:12 +01:00
Nicola Soranzo 713556029d Merge branch 'release_23.2' into release_24.0 2024-05-30 12:51:06 +01:00
Nicola Soranzo bd9a16988e Merge branch 'release_23.1' into release_23.2 2024-05-30 12:41:23 +01:00
mvdbeek 063d985650 Also set model to nullable=False 2024-05-30 11:50:43 +02:00
mvdbeek 4099fcc15a Set all old keys to deleted 2024-05-30 11:45:12 +02:00
Marius van den Beek 0db89059ef Merge pull request #18250 from mvdbeek/test_robustness
[24.0] Skip tests if toolshed, dx.doi not responding
2024-05-30 09:48:26 +02:00
John Davis a774c9234c Add ts db migration: deleted column to api_keys tbl 2024-05-29 22:49:30 -04:00
Nate Coraor b121db548c Merge pull request #18256 from mvdbeek/server_external_hgweb
[23.1] Minor fix to enable external hgweb process
2024-05-29 11:58:14 -04:00
mvdbeek 410ccb9ab2 Fix up lock handling in hgweb_config_manager 2024-05-29 17:50:49 +02:00
mvdbeek b00beec3d2 Allow configuring hgweb repo prefix 2024-05-29 17:44:55 +02:00
mvdbeek 2ea3d342cc Import tool shed url 2024-05-29 15:29:39 +02:00
davelopez ec451f26f7 Update watchHistory test to expect rethrowSimple error
Instead of AxiosError
2024-05-29 14:58:17 +02:00
davelopez 518b0257ac Add tests for fatal error loading history 2024-05-29 14:22:46 +02:00
davelopez 1884ec4765 Hide history export UI on fatal error and show alert 2024-05-29 14:19:50 +02:00
davelopez 16f3be6904 Refactor HistoryExport tests to use MockAxios 2024-05-29 14:18:46 +02:00
davelopez 7d5385107f Add optional parameter to historyStore.getHistoryById
The `getHistoryById` function in `historyStore.ts` now accepts an optional parameter `shouldFetchIfMissing` which determines whether to load the history if it is not already in the store. If `shouldFetchIfMissing` is set to `false`, the function will return `null` instead of fetching the history.
2024-05-29 14:17:16 +02:00
davelopez c9e6144451 Rethrow errors instead of just log them in historyStore 2024-05-29 14:15:59 +02:00
mvdbeek b0ea69e418 Fix import order 2024-05-29 13:58:09 +02:00
mvdbeek ce1582f46a Move assertions out request error handling 2024-05-29 13:50:29 +02:00
Marius van den BeekandNicola Soranzo 5d2ccdfbe7 Use variable
Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
2024-05-29 13:49:10 +02:00
mvdbeek d8379a79a1 Also skip unit test 2024-05-29 13:39:26 +02:00
Marius van den BeekandNicola Soranzo 74e8d3257b Make it an f-string
Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
2024-05-29 13:35:52 +02:00
mvdbeek 5f1ec2b06f Skip tests that require toolshed to be up if toolshed down 2024-05-29 13:30:22 +02:00
mvdbeek 229b1c5bcb Skip doi unit test if request fails 2024-05-29 13:30:22 +02:00
Marius van den Beek b16359161b Merge pull request #18244 from ahmedhamidawan/change_activity_go_to_btn_color
[24.1] Change `ActivityPanel` go to button to primary
2024-05-29 11:23:31 +02:00
Marius van den Beek 36a9d131ed Merge pull request #18247 from itisAliRH/workflow-allow-bookmark-public
[24.1] Allow bookmarking public workflows
2024-05-29 11:23:01 +02:00
Marius van den Beek a2b03ac42b Merge pull request #18234 from davelopez/24.0_drop_restriction_switch_immutable_histories
[24.1] Drop restriction to switch to immutable histories
2024-05-29 11:22:29 +02:00
Marius van den Beek f0d4f52f3e Merge pull request #18204 from martenson/tight-axt
[24.1] Tighten axt sniffer
2024-05-29 10:39:01 +02:00
Marius van den Beek 8ed752a0a0 Merge pull request #18239 from mvdbeek/release_24.1
Merge 24.0 into 24.1
2024-05-28 19:25:24 +02:00
Ahmed Hamid Awan c2438b2f06 Merge pull request #18243 from davelopez/24.0_fix_userOwnsHistory_conditions
[24.0] Fix userOwnsHistory conditions
2024-05-28 12:12:06 -05:00
Alireza Heidari 067f6df3ef : allow bookmarking public workflows 2024-05-28 18:38:34 +02:00
Ahmed AwanandAlireza Heidari ad328169ff [24.1] Change ActivityPanel go to button to primary
Tiny change that reverts the button's color to primary.

Co-authored-by: Alireza Heidari <itisalirh@gmail.com>
2024-05-28 09:55:45 -05:00
davelopez 1637e202e5 Adapt History SelectorModal test 2024-05-28 14:55:37 +02:00
davelopez fa73f2e9f4 Fix conditions for userOwnsHistory and isRegisteredUser 2024-05-28 14:54:40 +02:00
mvdbeek 16cb72703a Fix up loading failed error state in Dataset Attributes component 2024-05-28 14:37:15 +02:00
mvdbeek 093dcc8d3d Merge branch 'release_24.0' into release_24.1 2024-05-28 14:34:20 +02:00
davelopez 9d662f5e49 Adapt History SelectorModal test 2024-05-28 14:30:19 +02:00
davelopez 6f38f5b7fe Fix conditions for userOwnsHistory and isRegisteredUser 2024-05-28 13:34:56 +02:00
David López ce53c7cc03 Merge pull request #18235 from mvdbeek/accessible_followup
[24.0] Fix element serialization for collections that aren't populated yet
2024-05-28 09:58:31 +02:00
mvdbeek 0359063816 Fix element serialization for collections that aren't populated yet
Fixes
https://github.com/galaxyproject/galaxy/pull/17818#issuecomment-2134060961:
```
AttributeError
'NoneType' object has no attribute 'dataset'
```
2024-05-28 08:15:19 +02:00
Marius van den Beek 316eb5bf81 Merge pull request #18233 from mvdbeek/reset_content_length_if_no_error_handling
[24.0] Reset content-length for unhandled exceptions
2024-05-27 20:00:39 +02:00