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 23.0 into dev #15902

Merged
merged 69 commits into from Apr 6, 2023
Merged

Merge 23.0 into dev #15902

merged 69 commits into from Apr 6, 2023

Conversation

nsoranzo
Copy link
Member

@nsoranzo nsoranzo commented Apr 5, 2023

Alternative to #15901 .

(Hopefully) more correctly solves conflicts in:

  • client/src/components/Workflow/Editor/modules/terminals.ts
  • lib/galaxy/dependencies/pinned-requirements.txt
  • lib/galaxy/webapps/galaxy/api/users.py

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.

jdavcs and others added 30 commits December 16, 2022 10:15
…e_attr_err

[22.01] Fix maintenance script bug
Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
for previously connected step that should still be mapped over.
[22.01] add security checks to page and visualization APIs
We should track this in a finer grained way maybe,
but it'll work. This fixes displaying the right inferred
collection source type when you change connections.
This PR fixes tool recommendation galaxyproject#15723 partially, only in the workflow editor
allows toggling Recommendations using v-if
…n_columns_comment

[22.01] xsd: add forgotten comment attribute
…ort-patch-3

[23.0] Fix tool recommendation in the workflow editor
Remove duplicate dataset entries in Collections
@nsoranzo
Copy link
Member Author

nsoranzo commented Apr 5, 2023

Looks like the merge of client/src/components/Workflow/Editor/modules/terminals.ts is still not correct, can you have a look @mvdbeek ?

Co-authored-by: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com>
@nsoranzo
Copy link
Member Author

nsoranzo commented Apr 6, 2023

Thanks @ElectronicBlueberry !

@mvdbeek mvdbeek merged commit 851625c into galaxyproject:dev Apr 6, 2023
42 checks passed
@nsoranzo nsoranzo deleted the merge_23.0_forward branch April 10, 2023 23:05
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.

None yet