Merge remote-tracking branch 'mainline/develop' into BUGS
Conflicts: dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
Showing
- .php_cs 0 additions, 1 deletion.php_cs
- app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php 41 additions, 9 deletions...cation/Controller/Adminhtml/System/Message/ListAction.php
- app/code/Magento/AdminNotification/etc/config.xml 1 addition, 1 deletionapp/code/Magento/AdminNotification/etc/config.xml
- app/code/Magento/AdminNotification/etc/module.xml 0 additions, 1 deletionapp/code/Magento/AdminNotification/etc/module.xml
- app/code/Magento/Authorization/Setup/InstallData.php 12 additions, 0 deletionsapp/code/Magento/Authorization/Setup/InstallData.php
- app/code/Magento/Backend/Test/Unit/Model/Menu/Filter/IteratorTest.php 21 additions, 13 deletions...ento/Backend/Test/Unit/Model/Menu/Filter/IteratorTest.php
- app/code/Magento/Backend/etc/adminhtml/menu.xml 1 addition, 1 deletionapp/code/Magento/Backend/etc/adminhtml/menu.xml
- app/code/Magento/Backend/etc/config.xml 1 addition, 1 deletionapp/code/Magento/Backend/etc/config.xml
- app/code/Magento/Bundle/Api/Data/LinkInterface.php 15 additions, 0 deletionsapp/code/Magento/Bundle/Api/Data/LinkInterface.php
- app/code/Magento/Bundle/Api/Data/OptionInterface.php 15 additions, 0 deletionsapp/code/Magento/Bundle/Api/Data/OptionInterface.php
- app/code/Magento/Bundle/Api/Data/OptionTypeInterface.php 15 additions, 0 deletionsapp/code/Magento/Bundle/Api/Data/OptionTypeInterface.php
- app/code/Magento/Bundle/Api/ProductLinkManagementInterface.php 4 additions, 4 deletions...ode/Magento/Bundle/Api/ProductLinkManagementInterface.php
- app/code/Magento/Bundle/Api/ProductOptionRepositoryInterface.php 6 additions, 6 deletions...e/Magento/Bundle/Api/ProductOptionRepositoryInterface.php
- app/code/Magento/Bundle/Model/Link.php 22 additions, 0 deletionsapp/code/Magento/Bundle/Model/Link.php
- app/code/Magento/Bundle/Model/LinkManagement.php 5 additions, 5 deletionsapp/code/Magento/Bundle/Model/LinkManagement.php
- app/code/Magento/Bundle/Model/Option.php 21 additions, 0 deletionsapp/code/Magento/Bundle/Model/Option.php
- app/code/Magento/Bundle/Model/OptionRepository.php 9 additions, 9 deletionsapp/code/Magento/Bundle/Model/OptionRepository.php
- app/code/Magento/Bundle/Model/Plugin/BundleLoadOptions.php 12 additions, 10 deletionsapp/code/Magento/Bundle/Model/Plugin/BundleLoadOptions.php
- app/code/Magento/Bundle/Model/Plugin/BundleSaveOptions.php 2 additions, 7 deletionsapp/code/Magento/Bundle/Model/Plugin/BundleSaveOptions.php
- app/code/Magento/Bundle/Model/Source/Option/Type.php 29 additions, 4 deletionsapp/code/Magento/Bundle/Model/Source/Option/Type.php
Please register or sign in to comment