Skip to content

Commit 1782129

Browse files
committed
1.1.67 Release
- Resolved conflict: "ACSD-64118 is not compatible with optional: ACSD-55100 ACSD-64178" - Updated patches-info.json
1 parent c98b029 commit 1782129

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

patches-info.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

patches/os/ACP2E-3976_2.4.7.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,18 +162,18 @@ index 00000000000..1806af4b261
162162
+ }
163163
+}
164164
diff --git a/vendor/magento/module-catalog/etc/di.xml b/vendor/magento/module-catalog/etc/di.xml
165-
index a13175fa78e..8c381ce5954 100644
165+
index df36733051c..4d19e858a78 100644
166166
--- a/vendor/magento/module-catalog/etc/di.xml
167167
+++ b/vendor/magento/module-catalog/etc/di.xml
168-
@@ -78,6 +78,7 @@
169-
<preference for="Magento\Catalog\Api\CategoryListDeleteBySkuInterface" type="Magento\Catalog\Model\CategoryLinkRepository"/>
168+
@@ -79,6 +79,7 @@
170169
<preference for="Magento\Theme\CustomerData\MessagesProviderInterface" type="Magento\Catalog\Model\Theme\CustomerData\MessagesProvider"/>
171170
<preference for="Magento\Catalog\Api\ProductAttributeIsFilterableManagementInterface" type="Magento\Catalog\Model\Product\Attribute\IsFilterableManagement" />
171+
<preference for="Magento\Catalog\Model\Product\Attribute\AttributeSetUnassignValidatorInterface" type="Magento\Catalog\Model\Product\Attribute\AttributeSetUnassignValidator" />
172172
+ <preference for="Magento\Catalog\Model\ProductMutexInterface" type="Magento\Catalog\Model\ProductMutex" />
173173
<type name="Magento\Customer\Model\ResourceModel\Visitor">
174174
<plugin name="catalogLog" type="Magento\Catalog\Model\Plugin\Log" />
175175
</type>
176-
@@ -1329,6 +1330,7 @@
176+
@@ -1330,6 +1331,7 @@
177177
<type name="Magento\Catalog\Api\ProductRepositoryInterface">
178178
<plugin name="remove_images_from_gallery_after_removing_product"
179179
type="Magento\Catalog\Plugin\RemoveImagesFromGalleryAfterRemovingProduct"/>

support-patches.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15024,7 +15024,11 @@
1502415024
"file": "os/ACSD-64118_2.4.5-p7.patch"
1502515025
},
1502615026
">=2.4.7 <2.4.8": {
15027-
"file": "os/ACP2E-3976_2.4.7.patch"
15027+
"file": "os/ACP2E-3976_2.4.7.patch",
15028+
"require": [
15029+
"ACSD-55100",
15030+
"ACSD-64178"
15031+
]
1502815032
},
1502915033
">=2.4.8 <2.4.9": {
1503015034
"file": "os/ACP2E-3988_2.4.8.patch"

0 commit comments

Comments
 (0)