MAGETWO-85610: Merge branch '2.2-develop' of github.com:magento/magento2ce...
MAGETWO-85610: Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGETWO-85610-magento-engcom-magento2ce-1021
Showing
- app/code/Magento/Catalog/Console/Command/ImagesResizeCommand.php 20 additions, 8 deletions...e/Magento/Catalog/Console/Command/ImagesResizeCommand.php
- app/code/Magento/Catalog/Model/Product/Attribute/Repository.php 23 additions, 9 deletions...de/Magento/Catalog/Model/Product/Attribute/Repository.php
- app/code/Magento/Catalog/Model/Product/Copier.php 21 additions, 18 deletionsapp/code/Magento/Catalog/Model/Product/Copier.php
- app/code/Magento/Catalog/Model/Product/Image/Cache.php 30 additions, 3 deletionsapp/code/Magento/Catalog/Model/Product/Image/Cache.php
- app/code/Magento/Catalog/Test/Unit/Console/Command/ImagesResizeCommandTest.php 40 additions, 0 deletions...log/Test/Unit/Console/Command/ImagesResizeCommandTest.php
- app/code/Magento/Catalog/Test/Unit/Model/Product/Image/CacheTest.php 52 additions, 0 deletions...gento/Catalog/Test/Unit/Model/Product/Image/CacheTest.php
- app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php 17 additions, 50 deletions...ogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php
- app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/QueryBuilder.php 148 additions, 0 deletions...l/Adapter/Mysql/Aggregation/DataProvider/QueryBuilder.php
- app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Aggregation/DataProvider/QueryBuilderTest.php 154 additions, 0 deletions...apter/Mysql/Aggregation/DataProvider/QueryBuilderTest.php
- app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Aggregation/DataProviderTest.php 28 additions, 39 deletions...Unit/Model/Adapter/Mysql/Aggregation/DataProviderTest.php
- app/code/Magento/Directory/Setup/UpgradeData.php 70 additions, 10 deletionsapp/code/Magento/Directory/Setup/UpgradeData.php
- app/code/Magento/Directory/etc/module.xml 1 addition, 1 deletionapp/code/Magento/Directory/etc/module.xml
- app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml 3 additions, 3 deletions.../Magento/Marketplace/view/adminhtml/templates/index.phtml
- app/code/Magento/Marketplace/view/adminhtml/web/partners/images/magento-connect.png 0 additions, 0 deletions...ce/view/adminhtml/web/partners/images/magento-connect.png
- app/code/Magento/Marketplace/view/adminhtml/web/partners/images/magento-marketplace.svg 1 addition, 0 deletions...iew/adminhtml/web/partners/images/magento-marketplace.svg
- app/design/adminhtml/Magento/backend/Magento_Marketplace/web/css/source/_module.less 1 addition, 1 deletion...o/backend/Magento_Marketplace/web/css/source/_module.less
- dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeRepositoryTest.php 30 additions, 1 deletion...te/Magento/Catalog/Api/ProductAttributeRepositoryTest.php
- dev/tests/integration/testsuite/Magento/Catalog/Model/Product/CopierTest.php 90 additions, 0 deletions...on/testsuite/Magento/Catalog/Model/Product/CopierTest.php
- dev/tests/integration/testsuite/Magento/Framework/Config/ConverterTest.php 94 additions, 0 deletions...tion/testsuite/Magento/Framework/Config/ConverterTest.php
- lib/internal/Magento/Framework/Config/Converter.php 3 additions, 1 deletionlib/internal/Magento/Framework/Config/Converter.php
Please register or sign in to comment