Merge branch 'develop' into MAGETWO-58924-just-UrlRewriteMap-develop-final
Showing
- app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php 18 additions, 0 deletions...gento/Customer/Model/ResourceModel/CustomerRepository.php
- app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php 18 additions, 11 deletions.../Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php
- app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php 2 additions, 0 deletions...gento/Multishipping/Model/Checkout/Type/Multishipping.php
- app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php 209 additions, 142 deletions...pping/Test/Unit/Model/Checkout/Type/MultishippingTest.php
- app/code/Magento/ProductVideo/view/frontend/web/js/load-player.js 1 addition, 1 deletion.../Magento/ProductVideo/view/frontend/web/js/load-player.js
- app/code/Magento/Sitemap/Model/Sitemap.php 3 additions, 1 deletionapp/code/Magento/Sitemap/Model/Sitemap.php
- app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php 24 additions, 2 deletionsapp/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php
- dev/tests/functional/lib/Magento/Mtf/Client/Element/LiselectstoreElement.php 1 addition, 1 deletion...l/lib/Magento/Mtf/Client/Element/LiselectstoreElement.php
- dev/tests/functional/phpunit.xml.dist 1 addition, 0 deletionsdev/tests/functional/phpunit.xml.dist
- dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Source/Date.php 28 additions, 1 deletion...al/tests/app/Magento/Backend/Test/Fixture/Source/Date.php
- dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.xml 4 additions, 0 deletions...ento/Catalog/Test/Block/Adminhtml/Product/ProductForm.xml
- dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml 1 addition, 0 deletions...app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml
- dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml 30 additions, 0 deletions.../Magento/Catalog/Test/Repository/CatalogProductSimple.xml
- dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/ConfigData.xml 16 additions, 0 deletions.../tests/app/Magento/Catalog/Test/Repository/ConfigData.xml
- dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/CustomerRepositoryTest.php 38 additions, 0 deletions...o/Customer/Model/ResourceModel/CustomerRepositoryTest.php
- nginx.conf.sample 3 additions, 3 deletionsnginx.conf.sample
Please register or sign in to comment