Merge remote-tracking branch 'upstream/develop' into MAGETWO-58354-block-cache-exploit
Showing
- app/code/Magento/Catalog/Model/Category.php 1 addition, 1 deletionapp/code/Magento/Catalog/Model/Category.php
- app/code/Magento/Catalog/Model/Product.php 2 additions, 2 deletionsapp/code/Magento/Catalog/Model/Product.php
- app/code/Magento/Catalog/Model/Product/Option/Type/File.php 14 additions, 4 deletionsapp/code/Magento/Catalog/Model/Product/Option/Type/File.php
- app/code/Magento/Catalog/Test/Unit/Block/Product/ListProductTest.php 2 additions, 2 deletions...gento/Catalog/Test/Unit/Block/Product/ListProductTest.php
- app/code/Magento/Catalog/Test/Unit/Block/Product/ViewTest.php 3 additions, 3 deletions...code/Magento/Catalog/Test/Unit/Block/Product/ViewTest.php
- app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Type/FileTest.php 30 additions, 11 deletions.../Catalog/Test/Unit/Model/Product/Option/Type/FileTest.php
- app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php 10 additions, 10 deletionsapp/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
- app/code/Magento/Catalog/etc/di.xml 3 additions, 0 deletionsapp/code/Magento/Catalog/etc/di.xml
- app/code/Magento/Catalog/etc/frontend/di.xml 0 additions, 3 deletionsapp/code/Magento/Catalog/etc/frontend/di.xml
- app/code/Magento/CatalogImportExport/Model/Export/Product.php 34 additions, 15 deletions...code/Magento/CatalogImportExport/Model/Export/Product.php
- app/code/Magento/CatalogImportExport/Model/Import/Product.php 10 additions, 3 deletions...code/Magento/CatalogImportExport/Model/Import/Product.php
- app/code/Magento/CatalogInventory/Test/Unit/Model/Adminhtml/Stock/ItemTest.php 1 addition, 1 deletion...logInventory/Test/Unit/Model/Adminhtml/Stock/ItemTest.php
- app/code/Magento/Cms/Model/Block.php 2 additions, 2 deletionsapp/code/Magento/Cms/Model/Block.php
- app/code/Magento/Cms/Model/Page.php 2 additions, 2 deletionsapp/code/Magento/Cms/Model/Page.php
- app/code/Magento/Email/Model/Mail/TransportInterfacePlugin.php 51 additions, 0 deletions...ode/Magento/Email/Model/Mail/TransportInterfacePlugin.php
- app/code/Magento/Email/Model/Template.php 5 additions, 18 deletionsapp/code/Magento/Email/Model/Template.php
- app/code/Magento/Email/Test/Unit/Model/TemplateTest.php 1 addition, 18 deletionsapp/code/Magento/Email/Test/Unit/Model/TemplateTest.php
- app/code/Magento/Email/etc/di.xml 1 addition, 0 deletionsapp/code/Magento/Email/etc/di.xml
- app/code/Magento/Newsletter/Model/Template.php 3 additions, 5 deletionsapp/code/Magento/Newsletter/Model/Template.php
- app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php 51 additions, 0 deletionsapp/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php
Please register or sign in to comment