Skip to content

Conversation

@fballiano
Copy link
Contributor

@fballiano fballiano commented Jul 29, 2025

There were some conflicts there got auto-fixed, all except one, which I committed this way:

Screenshot 2025-07-29 alle 13 21 55

but I'm not sure, please @rhoerr @sprankhub @simsComputing @Vinai could you check this?

Fixes #148

@fballiano fballiano requested a review from a team as a code owner July 29, 2025 12:24
@ghost

This comment was marked as off-topic.

@Vinai
Copy link
Contributor

Vinai commented Aug 12, 2025

Note to self: These changes should fix the issue that some integrations stop working.

@rhoerr
Copy link
Contributor

rhoerr commented Aug 12, 2025

Oh -- this actually isn't related to the integration tokens issue. This pulls in #134 , test fixes.

We can still process it, but it's unrelated.

The commit that fixes #148 (can't activate integration tokens) is magento/magento2@9995ae5

@fballiano fballiano changed the title Cherry-picked PR #134 into release/1.x Fix integration tests for Magento_Backend and Magento_Bundle (Cherry-picked PR #134 into release/1.x) Aug 12, 2025
@fballiano
Copy link
Contributor Author

the one about integration tokens is already part of release/1.x so nothing to do there :-)

Screenshot 2025-08-12 alle 18 03 52

@fballiano
Copy link
Contributor Author

can we approve this in the meanwhile?

Copy link
Contributor

@rhoerr rhoerr left a comment

Choose a reason for hiding this comment

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

Approved per prior merge of #134

@rhoerr rhoerr merged commit 04f6d1d into mage-os:release/1.x Aug 13, 2025
6 of 9 checks passed
@fballiano fballiano deleted the cp_pr_134 branch August 13, 2025 13:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants