Merge remote-tracking branch 'upstream/develop' into MAGETWO-57251-eliminate-escapenotverified
Showing
- app/code/Magento/Catalog/Model/Product.php 12 additions, 1 deletionapp/code/Magento/Catalog/Model/Product.php
- app/code/Magento/Catalog/Model/Product/Image.php 1 addition, 2 deletionsapp/code/Magento/Catalog/Model/Product/Image.php
- app/code/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php 2 additions, 2 deletions...ode/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php
- app/code/Magento/ConfigurableProduct/Model/LinkManagement.php 99 additions, 2 deletions...code/Magento/ConfigurableProduct/Model/LinkManagement.php
- app/code/Magento/ConfigurableProduct/Test/Unit/Model/LinkManagementTest.php 73 additions, 16 deletions...onfigurableProduct/Test/Unit/Model/LinkManagementTest.php
- app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php 1 addition, 5 deletions...code/Magento/Customer/Controller/Adminhtml/Index/Save.php
- app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php 32 additions, 86 deletions...ustomer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php
- app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php 3 additions, 3 deletions...agento/Customer/Test/Unit/Model/AccountManagementTest.php
- app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml 1 addition, 1 deletion...agento/Newsletter/view/frontend/templates/subscribe.phtml
- app/code/Magento/PageCache/Model/Config.php 11 additions, 5 deletionsapp/code/Magento/PageCache/Model/Config.php
- dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/LinkManagementTest.php 169 additions, 4 deletions...te/Magento/ConfigurableProduct/Api/LinkManagementTest.php
- dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/GlobalSearchEntityTest.xml 5 additions, 0 deletions.../Magento/Backend/Test/TestCase/GlobalSearchEntityTest.xml
- dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderWithPayPalBraintreeVaultBackendTest.xml 1 addition, 1 deletion...stCase/CreateOrderWithPayPalBraintreeVaultBackendTest.xml
- dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml 10 additions, 1 deletion...to/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml
- dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest.php 1 addition, 0 deletions...to/Bundle/Test/TestCase/UpdateBundleProductEntityTest.php
- dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml 4 additions, 1 deletion...talog/Test/TestCase/Category/CreateCategoryEntityTest.xml
- dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/NavigateMenuTest.xml 1 addition, 1 deletion...ts/app/Magento/Catalog/Test/TestCase/NavigateMenuTest.xml
- dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.php 1 addition, 0 deletions.../Catalog/Test/TestCase/Product/AddCompareProductsTest.php
- dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.xml 1 addition, 0 deletions.../Catalog/Test/TestCase/Product/AddCompareProductsTest.xml
- dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ClearAllCompareProductsTest.xml 1 addition, 0 deletions...log/Test/TestCase/Product/ClearAllCompareProductsTest.xml
Please register or sign in to comment