Merge remote-tracking branch 'upstream/develop' into MAGETWO-28383-restore-whitelist
Showing
- app/code/Magento/Bundle/Model/Plugin/BundleLoadOptions.php 7 additions, 8 deletionsapp/code/Magento/Bundle/Model/Plugin/BundleLoadOptions.php
- app/code/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php 1 addition, 0 deletions...e/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php
- app/code/Magento/Bundle/Test/Unit/Model/Plugin/BundleLoadOptionsTest.php 7 additions, 7 deletions...o/Bundle/Test/Unit/Model/Plugin/BundleLoadOptionsTest.php
- app/code/Magento/Catalog/Api/Data/CategoryAttributeSearchResultsInterface.php 8 additions, 0 deletions...alog/Api/Data/CategoryAttributeSearchResultsInterface.php
- app/code/Magento/Catalog/Api/Data/ProductAttributeDataBuilder.php 0 additions, 382 deletions.../Magento/Catalog/Api/Data/ProductAttributeDataBuilder.php
- app/code/Magento/Catalog/Api/Data/ProductAttributeSearchResultsInterface.php 8 additions, 0 deletions...talog/Api/Data/ProductAttributeSearchResultsInterface.php
- app/code/Magento/Catalog/Api/Data/ProductSearchResultsInterface.php 8 additions, 0 deletions...agento/Catalog/Api/Data/ProductSearchResultsInterface.php
- app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Group/AbstractGroup.php 6 additions, 6 deletions.../Adminhtml/Product/Edit/Tab/Price/Group/AbstractGroup.php
- app/code/Magento/Catalog/Model/Category/AttributeRepository.php 3 additions, 3 deletions...de/Magento/Catalog/Model/Category/AttributeRepository.php
- app/code/Magento/Catalog/Model/Product/Attribute/Repository.php 3 additions, 3 deletions...de/Magento/Catalog/Model/Product/Attribute/Repository.php
- app/code/Magento/Catalog/Model/Product/Attribute/SetRepository.php 3 additions, 3 deletions...Magento/Catalog/Model/Product/Attribute/SetRepository.php
- app/code/Magento/Catalog/Model/Product/Option/Converter.php 1 addition, 1 deletionapp/code/Magento/Catalog/Model/Product/Option/Converter.php
- app/code/Magento/Catalog/Model/ProductRepository.php 13 additions, 12 deletionsapp/code/Magento/Catalog/Model/ProductRepository.php
- app/code/Magento/Catalog/Test/Unit/Model/Category/AttributeRepositoryTest.php 4 additions, 1 deletion...alog/Test/Unit/Model/Category/AttributeRepositoryTest.php
- app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/RepositoryTest.php 4 additions, 1 deletion...alog/Test/Unit/Model/Product/Attribute/RepositoryTest.php
- app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/SetRepositoryTest.php 1 addition, 1 deletion...g/Test/Unit/Model/Product/Attribute/SetRepositoryTest.php
- app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php 17 additions, 11 deletions...Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php
- app/code/Magento/Catalog/etc/di.xml 0 additions, 10 deletionsapp/code/Magento/Catalog/etc/di.xml
- app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml 1 addition, 1 deletion...og/view/base/templates/product/price/amount/default.phtml
- app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php 8 additions, 0 deletions...to/CatalogInventory/Api/Data/StockCollectionInterface.php
Please register or sign in to comment