Merge 22.01 -> 22.05 #15850
Merged
Merge 22.01 -> 22.05 #15850
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…e_attr_err [22.01] Fix maintenance script bug
for has_n_columns follow up on galaxyproject#12528
Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
[22.01] add security checks to page and visualization APIs
…n_columns_comment [22.01] xsd: add forgotten comment attribute
|
(this is not right, yet -- see joinedload/eagerload issues in scripts/cleanup_datasets/cleanup_datasets.py) |
|
I'm going to go ahead and merge this in; none of it looks related to the changes anymore after applying black to the forward merge, and other PRs against 22.05 have similar failures. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ping @jdavcs for perusal of the maintenance script changes that conflicted.
How to test the changes?
(Select all options that apply)
License