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

[23.2] Fix merge #17491

Merged
merged 1 commit into from
Feb 19, 2024
Merged

[23.2] Fix merge #17491

merged 1 commit into from
Feb 19, 2024

Conversation

jdavcs
Copy link
Member

@jdavcs jdavcs commented Feb 18, 2024

Added during forward merge of 23.1 into 23.2 (as a result of a fix in #17448). File was deleted in #16709.

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 jdavcs added the merge label Feb 18, 2024
Copy link
Contributor

@davelopez davelopez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @jdavcs, this is correct.

Looking at the fix in #17448 seems that mergeArray here:

Object.keys(localItem).forEach((key) => {

Could have a similar issue? Ping @ahmedhamidawan

@mvdbeek mvdbeek merged commit a7afcc9 into galaxyproject:release_23.2 Feb 19, 2024
24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants