Merge remote-tracking branch 'upstream/develop' into pr2
# Conflicts: # dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml # dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Invoices/Grid.php
Showing
- app/code/Magento/Authorizenet/composer.json 3 additions, 0 deletionsapp/code/Magento/Authorizenet/composer.json
- app/code/Magento/Authorizenet/etc/di.xml 10 additions, 0 deletionsapp/code/Magento/Authorizenet/etc/di.xml
- app/code/Magento/Backend/Block/Cache/Grid/Massaction/ProductionModeVisibilityChecker.php 36 additions, 0 deletions...Cache/Grid/Massaction/ProductionModeVisibilityChecker.php
- app/code/Magento/Backend/Block/Widget/Grid/Massaction.php 1 addition, 4 deletionsapp/code/Magento/Backend/Block/Widget/Grid/Massaction.php
- app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php 20 additions, 6 deletions...ckend/Block/Widget/Grid/Massaction/AbstractMassaction.php
- app/code/Magento/Backend/Block/Widget/Grid/Massaction/VisibilityCheckerInterface.php 18 additions, 0 deletions...ock/Widget/Grid/Massaction/VisibilityCheckerInterface.php
- app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php 40 additions, 3 deletions...agento/Backend/Controller/Adminhtml/Cache/MassDisable.php
- app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php 40 additions, 3 deletions...Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php
- app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php 134 additions, 66 deletions...to/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php
- app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php 224 additions, 0 deletions.../Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php
- app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php 224 additions, 0 deletions...d/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php
- app/code/Magento/Backend/etc/di.xml 18 additions, 0 deletionsapp/code/Magento/Backend/etc/di.xml
- app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_block.xml 2 additions, 0 deletions...o/Backend/view/adminhtml/layout/adminhtml_cache_block.xml
- app/code/Magento/Braintree/etc/di.xml 14 additions, 2 deletionsapp/code/Magento/Braintree/etc/di.xml
- app/code/Magento/Checkout/etc/di.xml 7 additions, 0 deletionsapp/code/Magento/Checkout/etc/di.xml
- app/code/Magento/Config/App/Config/Source/DumpConfigSourceAggregated.php 152 additions, 0 deletions...o/Config/App/Config/Source/DumpConfigSourceAggregated.php
- app/code/Magento/Config/App/Config/Source/DumpConfigSourceInterface.php 21 additions, 0 deletions...to/Config/App/Config/Source/DumpConfigSourceInterface.php
- app/code/Magento/Config/App/Config/Type/System.php 26 additions, 25 deletionsapp/code/Magento/Config/App/Config/Type/System.php
- app/code/Magento/Config/Block/System/Config/Form.php 81 additions, 34 deletionsapp/code/Magento/Config/Block/System/Config/Form.php
- app/code/Magento/Config/Model/Config/Export/Comment.php 59 additions, 0 deletionsapp/code/Magento/Config/Model/Config/Export/Comment.php
Please register or sign in to comment