Skip to content

Commit bbcc950

Browse files
authored
Merge branch '2.4-develop' into remove_escapeHtml
2 parents 2d8c477 + 57a3231 commit bbcc950

File tree

86 files changed

+2307
-733
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+2307
-733
lines changed

app/code/Magento/Backend/Test/Mftf/ActionGroup/SecondaryGridActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
</arguments>
2121

2222
<!-- search for the name -->
23+
<waitForElementClickable selector="{{AdminSecondaryGridSection.resetFilters}}" stepKey="waitForFiltersReset"/>
2324
<click stepKey="resetFilters" selector="{{AdminSecondaryGridSection.resetFilters}}"/>
2425
<fillField stepKey="fillIdentifier" selector="{{searchInput}}" userInput="{{name}}"/>
2526
<click stepKey="searchForName" selector="{{AdminSecondaryGridSection.searchButton}}"/>

app/code/Magento/Bundle/Model/Product/SelectionProductsDisabledRequired.php

Lines changed: 0 additions & 173 deletions
This file was deleted.

app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price/DisabledProductOptionPriceModifier.php

Lines changed: 0 additions & 157 deletions
This file was deleted.

0 commit comments

Comments
 (0)