Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release_23.1 into release_23.2 #17471

Merged
merged 14 commits into from
Feb 14, 2024

Conversation

mvdbeek
Copy link
Member

@mvdbeek mvdbeek commented Feb 14, 2024

This included manually resolving conflicts in SelectionOperations.vue

How to test the changes?

(Select all options that apply)

  • I've included appropriate automated tests.
  • This is a refactoring of components with existing test coverage.
  • Instructions for manual testing are as follows:
    1. [add testing steps and prerequisites here if you didn't write automated tests covering all your changes]

License

  • I agree to license these and all my past contributions to the core galaxy codebase under the MIT license.

nuwang and others added 13 commits February 9, 2024 16:59
Co-authored-by: Marius van den Beek <[email protected]>
…ore_defensive

More defensive access of extra props in filesources
…peration_menu_bis

[23.1] Fix history bulk operations menu (part 2)
Only check ownership in `__get_history_collection_instance` if:
`collection_instance.history.published` = False
... since this api only needs to `check_accessible` as it is not modifying a collection
…dca_check

[23.1] Only check access permissions in `/api/{history_dataset_collection_id}/contents/{dataset_collection_id}`
@mvdbeek mvdbeek force-pushed the merge_forward_conflict branch from ff1d80c to ccb3e90 Compare February 14, 2024 14:31
@mvdbeek mvdbeek merged commit 51c5705 into galaxyproject:release_23.2 Feb 14, 2024
45 of 48 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants