Merge branch 'MAGETWO-49205' into switcher_stable
Showing
- app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php 28 additions, 19 deletionsapp/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
- app/code/Magento/Catalog/Controller/Adminhtml/Category.php 51 additions, 0 deletionsapp/code/Magento/Catalog/Controller/Adminhtml/Category.php
- app/code/Magento/Catalog/Controller/Adminhtml/Category/Add.php 36 additions, 3 deletions...ode/Magento/Catalog/Controller/Adminhtml/Category/Add.php
- app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php 4 additions, 43 deletions...de/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
- app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/IndexerState.php 0 additions, 63 deletions...og/Model/Indexer/Category/Product/Plugin/IndexerState.php
- app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/EditTest.php 4 additions, 0 deletions...alog/Test/Unit/Controller/Adminhtml/Category/EditTest.php
- app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Product/Plugin/IndexerStateTest.php 0 additions, 49 deletions...odel/Indexer/Category/Product/Plugin/IndexerStateTest.php
- app/code/Magento/Catalog/etc/di.xml 0 additions, 8 deletionsapp/code/Magento/Catalog/etc/di.xml
- app/code/Magento/Catalog/etc/indexer.xml 2 additions, 2 deletionsapp/code/Magento/Catalog/etc/indexer.xml
- app/code/Magento/Catalog/view/adminhtml/layout/catalog_category_add.xml 31 additions, 0 deletions...to/Catalog/view/adminhtml/layout/catalog_category_add.xml
- app/code/Magento/CatalogRule/etc/indexer.xml 2 additions, 2 deletionsapp/code/Magento/CatalogRule/etc/indexer.xml
- app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php 26 additions, 1 deletion...Magento/Indexer/Console/Command/IndexerReindexCommand.php
- app/code/Magento/Indexer/Model/Processor.php 16 additions, 1 deletionapp/code/Magento/Indexer/Model/Processor.php
- app/code/Magento/Indexer/Test/Unit/Console/Command/AbstractIndexerCommandCommonSetup.php 15 additions, 5 deletions...nit/Console/Command/AbstractIndexerCommandCommonSetup.php
- app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerReindexCommandTest.php 60 additions, 2 deletions...r/Test/Unit/Console/Command/IndexerReindexCommandTest.php
- dev/tests/integration/testsuite/Magento/Indexer/Model/Config/_files/result.php 1 addition, 0 deletions.../testsuite/Magento/Indexer/Model/Config/_files/result.php
- lib/internal/Magento/Framework/Indexer/Config/Converter.php 1 addition, 0 deletionslib/internal/Magento/Framework/Indexer/Config/Converter.php
- lib/internal/Magento/Framework/Indexer/Test/Unit/_files/indexer_config.php 2 additions, 0 deletions...nto/Framework/Indexer/Test/Unit/_files/indexer_config.php
- lib/internal/Magento/Framework/Indexer/etc/indexer.xsd 1 addition, 0 deletionslib/internal/Magento/Framework/Indexer/etc/indexer.xsd
- lib/internal/Magento/Framework/Indexer/etc/indexer_merged.xsd 1 addition, 0 deletions...internal/Magento/Framework/Indexer/etc/indexer_merged.xsd
Please register or sign in to comment