Merge remote-tracking branch 'mainline/develop' into develop
Showing
- app/code/Magento/Backend/Block/Menu.php 25 additions, 15 deletionsapp/code/Magento/Backend/Block/Menu.php
- app/code/Magento/Bundle/etc/service_data_attributes.xml 3 additions, 3 deletionsapp/code/Magento/Bundle/etc/service_data_attributes.xml
- app/code/Magento/CatalogInventory/etc/service_data_attributes.xml 20 additions, 0 deletions.../Magento/CatalogInventory/etc/service_data_attributes.xml
- app/code/Magento/GiftMessage/etc/service_data_attributes.xml 5 additions, 5 deletionsapp/code/Magento/GiftMessage/etc/service_data_attributes.xml
- app/code/Magento/GroupedProduct/etc/service_data_attributes.xml 3 additions, 3 deletions...de/Magento/GroupedProduct/etc/service_data_attributes.xml
- app/code/Magento/Sales/etc/service_data_attributes.xml 3 additions, 3 deletionsapp/code/Magento/Sales/etc/service_data_attributes.xml
- app/code/Magento/Theme/view/adminhtml/requirejs-config.js 3 additions, 0 deletionsapp/code/Magento/Theme/view/adminhtml/requirejs-config.js
- app/code/Magento/Webapi/Controller/Rest/Router/Route.php 2 additions, 9 deletionsapp/code/Magento/Webapi/Controller/Rest/Router/Route.php
- app/code/Magento/Webapi/Controller/Soap/Request/Handler.php 9 additions, 2 deletionsapp/code/Magento/Webapi/Controller/Soap/Request/Handler.php
- app/code/Magento/Webapi/Model/Rest/Config.php 1 addition, 17 deletionsapp/code/Magento/Webapi/Model/Rest/Config.php
- app/code/Magento/Webapi/Test/Unit/Controller/Rest/Router/RouteTest.php 3 additions, 3 deletions...nto/Webapi/Test/Unit/Controller/Rest/Router/RouteTest.php
- app/code/Magento/Webapi/Test/Unit/Controller/Soap/Request/HandlerTest.php 12 additions, 6 deletions.../Webapi/Test/Unit/Controller/Soap/Request/HandlerTest.php
- app/code/Magento/Webapi/Test/Unit/Model/DataObjectProcessorTest.php 15 additions, 1 deletion...agento/Webapi/Test/Unit/Model/DataObjectProcessorTest.php
- app/code/Magento/Webapi/Test/Unit/Model/Files/TestDataInterface.php 12 additions, 0 deletions...agento/Webapi/Test/Unit/Model/Files/TestDataInterface.php
- app/code/Magento/Webapi/etc/di.xml 7 additions, 1 deletionapp/code/Magento/Webapi/etc/di.xml
- app/code/Magento/Webapi/etc/webapi_rest/di.xml 21 additions, 0 deletionsapp/code/Magento/Webapi/etc/webapi_rest/di.xml
- app/code/Magento/Webapi/etc/webapi_soap/di.xml 22 additions, 0 deletionsapp/code/Magento/Webapi/etc/webapi_soap/di.xml
- dev/tests/api-functional/_files/Magento/TestModule1/etc/service_data_attributes.xml 5 additions, 5 deletions...files/Magento/TestModule1/etc/service_data_attributes.xml
- dev/tests/api-functional/_files/Magento/TestModuleMSC/etc/service_data_attributes.xml 5 additions, 5 deletions...les/Magento/TestModuleMSC/etc/service_data_attributes.xml
- dev/tests/api-functional/testsuite/Magento/Webapi/Routing/RestErrorHandlingTest.php 1 addition, 1 deletion...estsuite/Magento/Webapi/Routing/RestErrorHandlingTest.php
Please register or sign in to comment