Merge remote-tracking branch 'mainline/develop' into develop
Showing
- app/code/Magento/CatalogImportExport/Model/Export/Product.php 1 addition, 1 deletion...code/Magento/CatalogImportExport/Model/Export/Product.php
- app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable.php 0 additions, 4 deletions...rableProduct/Model/Resource/Product/Type/Configurable.php
- app/code/Magento/Newsletter/Model/Subscriber.php 1 addition, 1 deletionapp/code/Magento/Newsletter/Model/Subscriber.php
- app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php 164 additions, 0 deletions...ode/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php
- app/code/Magento/Theme/view/adminhtml/requirejs-config.js 3 additions, 0 deletionsapp/code/Magento/Theme/view/adminhtml/requirejs-config.js
- dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php 46 additions, 0 deletions.../Magento/CatalogImportExport/Model/Export/ProductTest.php
- dev/tests/integration/testsuite/Magento/ToolkitFramework/_files/small.xml 37 additions, 1 deletion...ation/testsuite/Magento/ToolkitFramework/_files/small.xml
- dev/tools/performance-toolkit/fixtures/indexers_states_apply.php 51 additions, 0 deletions...ls/performance-toolkit/fixtures/indexers_states_apply.php
- dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/Application.php 7 additions, 0 deletions...oolkit/framework/Magento/ToolkitFramework/Application.php
- dev/tools/performance-toolkit/generate.php 8 additions, 5 deletionsdev/tools/performance-toolkit/generate.php
- dev/tools/performance-toolkit/profiles/ce/extra_large.xml 34 additions, 0 deletionsdev/tools/performance-toolkit/profiles/ce/extra_large.xml
- dev/tools/performance-toolkit/profiles/ce/large.xml 34 additions, 0 deletionsdev/tools/performance-toolkit/profiles/ce/large.xml
- dev/tools/performance-toolkit/profiles/ce/medium.xml 34 additions, 0 deletionsdev/tools/performance-toolkit/profiles/ce/medium.xml
- dev/tools/performance-toolkit/profiles/ce/small.xml 34 additions, 0 deletionsdev/tools/performance-toolkit/profiles/ce/small.xml
Please register or sign in to comment