There was an error fetching the commit references. Please try again later.
Merge remote-tracking branch 'mainline/develop' into MAGETWO-59264
Showing
- 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/Model/Product/Option/Type/FileTest.php 30 additions, 11 deletions.../Catalog/Test/Unit/Model/Product/Option/Type/FileTest.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/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
- app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Widget/Chooser.php 16 additions, 0 deletions...o/SalesRule/Controller/Adminhtml/Promo/Widget/Chooser.php
- app/code/Magento/SalesRule/Model/Rule/Condition/Product.php 22 additions, 0 deletionsapp/code/Magento/SalesRule/Model/Rule/Condition/Product.php
- app/code/Magento/SalesRule/Test/Unit/Model/Rule/Condition/ProductTest.php 161 additions, 0 deletions.../SalesRule/Test/Unit/Model/Rule/Condition/ProductTest.php
- dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/CategoryForm.xml 2 additions, 2 deletions...talog/Test/Block/Adminhtml/Category/Edit/CategoryForm.xml
- dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php 6 additions, 3 deletions...nto/Catalog/Test/Block/Product/ProductList/TopToolbar.php
- dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml 1 addition, 1 deletion...al/tests/app/Magento/Catalog/Test/Repository/Category.xml
- dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml 4 additions, 4 deletions...talog/Test/TestCase/Category/CreateCategoryEntityTest.xml
- dev/tests/integration/testsuite/Magento/Framework/Session/SaveHandlerTest.php 30 additions, 15 deletions...n/testsuite/Magento/Framework/Session/SaveHandlerTest.php
Please register or sign in to comment